annotate tests/test-rawcommit1.out @ 5192:33015dac5df5

convert: fix mercurial_sink.putcommit Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a revision that touches no files, but this can break regular conversions from some repositories: - conceptually, since we're converting a repo, we should try to make the new hg repo as similar as possible to the original repo - we should create a new changeset, even if the original revision didn't touch any files (maybe the commit message had some important bit); - even if a "regular" revision that doesn't touch any file may seem weird (and maybe even broken), it's completely legitimate for a merge revision to not touch any file, and, if we just skip it, the converted repo will end up with wrong history and possibly an extra head. As an example, say the crew and main hg repos are sync'ed. Somebody sends an important patch to the mailing list. Matt quickly applies and pushes it. But at the same time somebody also applies it to crew and pushes it. Suppose the commit message ended up being a bit different (say, there was a typo and somebody didn't fix it) or that the date ended up being different (because of different patch-applying scripts): the changeset hashes will be different, but the manifests will be the same. Since both changesets were pushed to public repos, it's hard to recall them. If both are merged, the manifest from the resulting merge revision will have the exact same contents as its parents - i.e. the merge revision really doesn't touch any file at all. To keep the file filtering stuff "working", the generic code was changed to skip empty revisions if we're filtering the repo, fixing a bug in the process (we want parents[0] instead of tip).
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 17 Aug 2007 20:18:05 -0300
parents 10b6fc51f672
children 8feb33c2d153
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
1 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
2 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
1657
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 993
diff changeset
3 (the rawcommit command is deprecated)
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
4 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
5 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
6 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1657
diff changeset
7 changeset: 2:e110db3db549
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
8 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
9 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1657
diff changeset
10 date: Mon Jan 12 13:46:40 1970 +0000
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
11 files: c
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
12 description:
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
13 2
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
14
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
15
1657
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 993
diff changeset
16 (the rawcommit command is deprecated)
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
17 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
18 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
19 changeset: 3:20652cf30cc0
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
20 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
21 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1657
diff changeset
22 date: Mon Jan 12 13:46:40 1970 +0000
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
23 files: b
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
24 description:
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
25 3
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
26
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
27
1657
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 993
diff changeset
28 (the rawcommit command is deprecated)
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
29 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
30 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
31 changeset: 4:42556b925639
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
32 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
33 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1657
diff changeset
34 date: Mon Jan 12 13:46:40 1970 +0000
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
35 files: a
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
36 description:
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
37 4
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
38
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
39
1657
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 993
diff changeset
40 (the rawcommit command is deprecated)
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
41 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
42 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
43 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
44 changeset: 4:42556b925639
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
45 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1657
diff changeset
46 date: Mon Jan 12 13:46:40 1970 +0000
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
47 files: a
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
48 description:
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
49 4
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
50
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
51
1657
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 993
diff changeset
52 (the rawcommit command is deprecated)
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
53 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
54 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
55 changeset: 6:8a0c9254b0ab
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
56 tag: tip
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
57 parent: 4:42556b925639
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1657
diff changeset
58 parent: 5:f56d4c64ab98
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
59 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1657
diff changeset
60 date: Mon Jan 12 13:46:40 1970 +0000
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
61 description:
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
62 6
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
63
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
64
1657
dbb8bba48510 deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents: 993
diff changeset
65 (the rawcommit command is deprecated)
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
66 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
67 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
68 changeset: 7:a5a6e1f312b9
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
69 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
70 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1657
diff changeset
71 date: Mon Jan 12 13:46:40 1970 +0000
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
72 description:
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
73 7
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
74
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
75