[PATCH 1 of 5 experimental] merge: normalize debug output of local/ancestor/other to diff3 convention
Gilles Moris
gilles.moris at free.fr
Tue Sep 21 14:18:17 CDT 2010
# HG changeset patch
# User Gilles Moris <gilles.moris at free.fr>
# Date 1284558617 -7200
# Node ID 073d7c08c4875a99982bf988145acfedb08068ee
# Parent 478385c46665cdc7192e0f876a2e8b2bc957f2fc
merge: normalize debug output of local/ancestor/other to diff3 convention
diff -r 478385c46665 -r 073d7c08c487 mercurial/filemerge.py
--- a/mercurial/filemerge.py Fri Sep 10 10:28:18 2010 +0200
+++ b/mercurial/filemerge.py Wed Sep 15 15:50:17 2010 +0200
@@ -173,7 +173,7 @@
else:
ui.status(_("merging %s\n") % fd)
- ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
+ ui.debug("filemerge: my %s ancestor %s other %s\n" % (fcd, fca, fco))
# do we attempt to simplemerge first?
try:
diff -r 478385c46665 -r 073d7c08c487 mercurial/merge.py
--- a/mercurial/merge.py Fri Sep 10 10:28:18 2010 +0200
+++ b/mercurial/merge.py Wed Sep 15 15:50:17 2010 +0200
@@ -162,7 +162,7 @@
repo.ui.note(_("resolving manifests\n"))
repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial)))
- repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2))
+ repo.ui.debug(" local %s ancestor %s remote %s\n" % (p1, pa, p2))
m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
copied = set(copy.values())
diff -r 478385c46665 -r 073d7c08c487 tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-copy-move-merge.t Wed Sep 15 15:50:17 2010 +0200
@@ -31,7 +31,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6
+ local add3f11052fa+ ancestor b8bf91eeebbc remote 17c05bb7fcb6
a: remote moved to c -> m
a: remote moved to b -> m
preserving a for resolve of b
@@ -40,12 +40,12 @@
updating: a 1/2 files (50.00%)
picked tool 'internal:merge' for b (binary False symlink False)
merging a and b to b
- my b at add3f11052fa+ other b at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
+ filemerge: my b at add3f11052fa+ ancestor a at b8bf91eeebbc other b at 17c05bb7fcb6
premerge successful
updating: a 2/2 files (100.00%)
picked tool 'internal:merge' for c (binary False symlink False)
merging a and c to c
- my c at add3f11052fa+ other c at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
+ filemerge: my c at add3f11052fa+ ancestor a at b8bf91eeebbc other c at 17c05bb7fcb6
premerge successful
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diff -r 478385c46665 -r 073d7c08c487 tests/test-double-merge.t
--- a/tests/test-double-merge.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-double-merge.t Wed Sep 15 15:50:17 2010 +0200
@@ -34,7 +34,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor e6dc8efe11cc local 6a0df1dad128+ remote 484bf6903104
+ local 6a0df1dad128+ ancestor e6dc8efe11cc remote 484bf6903104
foo: versions differ -> m
foo: remote copied to bar -> m
preserving foo for resolve of bar
@@ -42,12 +42,12 @@
updating: foo 1/2 files (50.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging foo and bar to bar
- my bar at 6a0df1dad128+ other bar at 484bf6903104 ancestor foo at e6dc8efe11cc
+ filemerge: my bar at 6a0df1dad128+ ancestor foo at e6dc8efe11cc other bar at 484bf6903104
premerge successful
updating: foo 2/2 files (100.00%)
picked tool 'internal:merge' for foo (binary False symlink False)
merging foo
- my foo at 6a0df1dad128+ other foo at 484bf6903104 ancestor foo at e6dc8efe11cc
+ filemerge: my foo at 6a0df1dad128+ ancestor foo at e6dc8efe11cc other foo at 484bf6903104
premerge successful
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diff -r 478385c46665 -r 073d7c08c487 tests/test-issue522.t
--- a/tests/test-issue522.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-issue522.t Wed Sep 15 15:50:17 2010 +0200
@@ -30,7 +30,7 @@
bar
resolving manifests
overwrite None partial False
- ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
+ local 71766447bdbb+ ancestor bbd179dfa0a7 remote 4d9e78aaceee
foo: remote is newer -> g
updating: foo 1/1 files (100.00%)
getting foo
diff -r 478385c46665 -r 073d7c08c487 tests/test-issue672.t
--- a/tests/test-issue672.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-issue672.t Wed Sep 15 15:50:17 2010 +0200
@@ -33,7 +33,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a
+ local c64f439569a9+ ancestor 81f4b099af3d remote c12dcd37c90a
1: other deleted -> r
1a: remote created -> g
updating: 1 1/2 files (50.00%)
@@ -64,13 +64,13 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96
+ local e327dca35ac8+ ancestor c64f439569a9 remote 746e9549ea96
1a: local copied/moved to 1 -> m
preserving 1a for resolve of 1a
updating: 1a 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1a and 1 to 1a
- my 1a at e327dca35ac8+ other 1 at 746e9549ea96 ancestor 1 at 81f4b099af3d
+ filemerge: my 1a at e327dca35ac8+ ancestor 1 at 81f4b099af3d other 1 at 746e9549ea96
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -87,14 +87,14 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8
+ local 746e9549ea96+ ancestor c64f439569a9 remote e327dca35ac8
1: remote moved to 1a -> m
preserving 1 for resolve of 1a
removing 1
updating: 1 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1 and 1a to 1a
- my 1a at 746e9549ea96+ other 1a at e327dca35ac8 ancestor 1 at 81f4b099af3d
+ filemerge: my 1a at 746e9549ea96+ ancestor 1 at 81f4b099af3d other 1a at e327dca35ac8
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diff -r 478385c46665 -r 073d7c08c487 tests/test-merge-commit.t
--- a/tests/test-merge-commit.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-merge-commit.t Wed Sep 15 15:50:17 2010 +0200
@@ -70,13 +70,13 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28
+ local 2263c1be0967+ ancestor 0f2ff26688b9 remote 0555950ead28
bar: versions differ -> m
preserving bar for resolve of bar
updating: bar 1/1 files (100.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging bar
- my bar at 2263c1be0967+ other bar at 0555950ead28 ancestor bar at 0f2ff26688b9
+ filemerge: my bar at 2263c1be0967+ ancestor bar at 0f2ff26688b9 other bar at 0555950ead28
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -158,13 +158,13 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0
+ local 2263c1be0967+ ancestor 0f2ff26688b9 remote 3ffa6b9e35f0
bar: versions differ -> m
preserving bar for resolve of bar
updating: bar 1/1 files (100.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging bar
- my bar at 2263c1be0967+ other bar at 3ffa6b9e35f0 ancestor bar at 0f2ff26688b9
+ filemerge: my bar at 2263c1be0967+ ancestor bar at 0f2ff26688b9 other bar at 3ffa6b9e35f0
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diff -r 478385c46665 -r 073d7c08c487 tests/test-merge-types.t
--- a/tests/test-merge-types.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-merge-types.t Wed Sep 15 15:50:17 2010 +0200
@@ -18,7 +18,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
+ local 521a1e40188f+ ancestor c334dc3be0da remote 3574f3e69b1c
conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
a: update permissions -> e
@@ -46,7 +46,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
+ local 3574f3e69b1c+ ancestor c334dc3be0da remote 521a1e40188f
conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
a: remote is newer -> g
diff -r 478385c46665 -r 073d7c08c487 tests/test-merge7.t
--- a/tests/test-merge7.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-merge7.t Wed Sep 15 15:50:17 2010 +0200
@@ -82,13 +82,13 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 96b70246a118 local 50c3a7e29886+ remote 40d11a4173a8
+ local 50c3a7e29886+ ancestor 96b70246a118 remote 40d11a4173a8
test.txt: versions differ -> m
preserving test.txt for resolve of test.txt
updating: test.txt 1/1 files (100.00%)
picked tool 'internal:merge' for test.txt (binary False symlink False)
merging test.txt
- my test.txt at 50c3a7e29886+ other test.txt at 40d11a4173a8 ancestor test.txt at 96b70246a118
+ filemerge: my test.txt at 50c3a7e29886+ ancestor test.txt at 96b70246a118 other test.txt at 40d11a4173a8
warning: conflicts during merge.
merging test.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
diff -r 478385c46665 -r 073d7c08c487 tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-rename-dir-merge.t Wed Sep 15 15:50:17 2010 +0200
@@ -41,7 +41,7 @@
file a/d -> b/d
resolving manifests
overwrite None partial False
- ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740
+ local ce36d17b18fb+ ancestor f9b20c0d4c51 remote 397f8b00a740
a/d: remote renamed directory to b/d -> d
a/c: remote renamed directory to b/c -> d
a/b: other deleted -> r
@@ -96,7 +96,7 @@
file a/c -> b/c
resolving manifests
overwrite None partial False
- ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb
+ local 397f8b00a740+ ancestor f9b20c0d4c51 remote ce36d17b18fb
None: local renamed directory to b/c -> d
updating:None 1/1 files (100.00%)
getting a/c to b/c
diff -r 478385c46665 -r 073d7c08c487 tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-rename-merge1.t Wed Sep 15 15:50:17 2010 +0200
@@ -36,7 +36,7 @@
a2: divergent renames -> dr
resolving manifests
overwrite None partial False
- ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c
+ local 044f8520aeeb+ ancestor af1939970a1c remote 85c198ef2f6c
a: remote moved to b -> m
b2: remote created -> g
preserving a for resolve of b
@@ -44,7 +44,7 @@
updating: a 1/3 files (33.33%)
picked tool 'internal:merge' for b (binary False symlink False)
merging a and b to b
- my b at 044f8520aeeb+ other b at 85c198ef2f6c ancestor a at af1939970a1c
+ filemerge: my b at 044f8520aeeb+ ancestor a at af1939970a1c other b at 85c198ef2f6c
premerge successful
updating: a2 2/3 files (66.67%)
warning: detected divergent renames of a2 to:
diff -r 478385c46665 -r 073d7c08c487 tests/test-rename-merge2.out
--- a/tests/test-rename-merge2.out Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-rename-merge2.out Wed Sep 15 15:50:17 2010 +0200
@@ -10,7 +10,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24
+ local e300d1c794ec+ ancestor 924404dff337 remote 4ce40f5aca24
rev: versions differ -> m
a: remote copied to b -> m
preserving a for resolve of b
@@ -18,12 +18,12 @@
updating: a 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
-my b at e300d1c794ec+ other b at 4ce40f5aca24 ancestor a at 924404dff337
+filemerge: my b at e300d1c794ec+ ancestor a at 924404dff337 other b at 4ce40f5aca24
premerge successful
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at e300d1c794ec+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
+filemerge: my rev at e300d1c794ec+ ancestor rev at 924404dff337 other rev at 4ce40f5aca24
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -44,7 +44,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71
+ local 86a2aa42fc76+ ancestor 924404dff337 remote f4db7e329e71
a: remote is newer -> g
b: local copied/moved to a -> m
rev: versions differ -> m
@@ -55,12 +55,12 @@
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
-my b at 86a2aa42fc76+ other a at f4db7e329e71 ancestor a at 924404dff337
+filemerge: my b at 86a2aa42fc76+ ancestor a at 924404dff337 other a at f4db7e329e71
premerge successful
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 86a2aa42fc76+ other rev at f4db7e329e71 ancestor rev at 924404dff337
+filemerge: my rev at 86a2aa42fc76+ ancestor rev at 924404dff337 other rev at f4db7e329e71
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -81,7 +81,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a
+ local e300d1c794ec+ ancestor 924404dff337 remote bdb19105162a
rev: versions differ -> m
a: remote moved to b -> m
preserving a for resolve of b
@@ -90,12 +90,12 @@
updating: a 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
-my b at e300d1c794ec+ other b at bdb19105162a ancestor a at 924404dff337
+filemerge: my b at e300d1c794ec+ ancestor a at 924404dff337 other b at bdb19105162a
premerge successful
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at e300d1c794ec+ other rev at bdb19105162a ancestor rev at 924404dff337
+filemerge: my rev at e300d1c794ec+ ancestor rev at 924404dff337 other rev at bdb19105162a
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -115,7 +115,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71
+ local 02963e448370+ ancestor 924404dff337 remote f4db7e329e71
b: local copied/moved to a -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -123,12 +123,12 @@
updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
-my b at 02963e448370+ other a at f4db7e329e71 ancestor a at 924404dff337
+filemerge: my b at 02963e448370+ ancestor a at 924404dff337 other a at f4db7e329e71
premerge successful
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 02963e448370+ other rev at f4db7e329e71 ancestor rev at 924404dff337
+filemerge: my rev at 02963e448370+ ancestor rev at 924404dff337 other rev at f4db7e329e71
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -148,7 +148,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24
+ local 94b33a1b7f2d+ ancestor 924404dff337 remote 4ce40f5aca24
rev: versions differ -> m
b: remote created -> g
preserving rev for resolve of rev
@@ -157,7 +157,7 @@
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 94b33a1b7f2d+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
+filemerge: my rev at 94b33a1b7f2d+ ancestor rev at 924404dff337 other rev at 4ce40f5aca24
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -177,13 +177,13 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336
+ local 86a2aa42fc76+ ancestor 924404dff337 remote 97c705ade336
rev: versions differ -> m
preserving rev for resolve of rev
updating: rev 1/1 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 86a2aa42fc76+ other rev at 97c705ade336 ancestor rev at 924404dff337
+filemerge: my rev at 86a2aa42fc76+ ancestor rev at 924404dff337 other rev at 97c705ade336
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -203,7 +203,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a
+ local 94b33a1b7f2d+ ancestor 924404dff337 remote bdb19105162a
a: other deleted -> r
rev: versions differ -> m
b: remote created -> g
@@ -215,7 +215,7 @@
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 94b33a1b7f2d+ other rev at bdb19105162a ancestor rev at 924404dff337
+filemerge: my rev at 94b33a1b7f2d+ ancestor rev at 924404dff337 other rev at bdb19105162a
1 files updated, 1 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -234,13 +234,13 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 02963e448370+ remote 97c705ade336
+ local 02963e448370+ ancestor 924404dff337 remote 97c705ade336
rev: versions differ -> m
preserving rev for resolve of rev
updating: rev 1/1 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 02963e448370+ other rev at 97c705ade336 ancestor rev at 924404dff337
+filemerge: my rev at 02963e448370+ ancestor rev at 924404dff337 other rev at 97c705ade336
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -254,7 +254,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493
+ local 62e7bf090eba+ ancestor 924404dff337 remote 49b6d8032493
b: versions differ -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -262,11 +262,11 @@
updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 62e7bf090eba+ other b at 49b6d8032493 ancestor a at 924404dff337
+filemerge: my b at 62e7bf090eba+ ancestor a at 924404dff337 other b at 49b6d8032493
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 62e7bf090eba+ other rev at 49b6d8032493 ancestor rev at 924404dff337
+filemerge: my rev at 62e7bf090eba+ ancestor rev at 924404dff337 other rev at 49b6d8032493
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -289,7 +289,7 @@
a: divergent renames -> dr
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e
+ local 02963e448370+ ancestor 924404dff337 remote fe905ef2c33e
rev: versions differ -> m
c: remote created -> g
preserving rev for resolve of rev
@@ -302,7 +302,7 @@
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 02963e448370+ other rev at fe905ef2c33e ancestor rev at 924404dff337
+filemerge: my rev at 02963e448370+ ancestor rev at 924404dff337 other rev at fe905ef2c33e
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -317,7 +317,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7
+ local 86a2aa42fc76+ ancestor 924404dff337 remote af30c7647fc7
b: versions differ -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -325,11 +325,11 @@
updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 86a2aa42fc76+ other b at af30c7647fc7 ancestor b at 000000000000
+filemerge: my b at 86a2aa42fc76+ ancestor b at 000000000000 other b at af30c7647fc7
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 86a2aa42fc76+ other rev at af30c7647fc7 ancestor rev at 924404dff337
+filemerge: my rev at 86a2aa42fc76+ ancestor rev at 924404dff337 other rev at af30c7647fc7
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -344,7 +344,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 59318016310c+ remote bdb19105162a
+ local 59318016310c+ ancestor 924404dff337 remote bdb19105162a
a: other deleted -> r
b: versions differ -> m
rev: versions differ -> m
@@ -355,11 +355,11 @@
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 59318016310c+ other b at bdb19105162a ancestor b at 000000000000
+filemerge: my b at 59318016310c+ ancestor b at 000000000000 other b at bdb19105162a
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
+filemerge: my rev at 59318016310c+ ancestor rev at 924404dff337 other rev at bdb19105162a
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -373,7 +373,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a
+ local 86a2aa42fc76+ ancestor 924404dff337 remote 8dbce441892a
a: remote is newer -> g
b: versions differ -> m
rev: versions differ -> m
@@ -384,11 +384,11 @@
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 86a2aa42fc76+ other b at 8dbce441892a ancestor b at 000000000000
+filemerge: my b at 86a2aa42fc76+ ancestor b at 000000000000 other b at 8dbce441892a
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
+filemerge: my rev at 86a2aa42fc76+ ancestor rev at 924404dff337 other rev at 8dbce441892a
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -403,7 +403,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 59318016310c+ remote bdb19105162a
+ local 59318016310c+ ancestor 924404dff337 remote bdb19105162a
a: other deleted -> r
b: versions differ -> m
rev: versions differ -> m
@@ -414,11 +414,11 @@
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 59318016310c+ other b at bdb19105162a ancestor b at 000000000000
+filemerge: my b at 59318016310c+ ancestor b at 000000000000 other b at bdb19105162a
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
+filemerge: my rev at 59318016310c+ ancestor rev at 924404dff337 other rev at bdb19105162a
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -432,7 +432,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a
+ local 86a2aa42fc76+ ancestor 924404dff337 remote 8dbce441892a
a: remote is newer -> g
b: versions differ -> m
rev: versions differ -> m
@@ -443,11 +443,11 @@
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 86a2aa42fc76+ other b at 8dbce441892a ancestor b at 000000000000
+filemerge: my b at 86a2aa42fc76+ ancestor b at 000000000000 other b at 8dbce441892a
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
+filemerge: my rev at 86a2aa42fc76+ ancestor rev at 924404dff337 other rev at 8dbce441892a
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -462,7 +462,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24
+ local 0b76e65c8289+ ancestor 924404dff337 remote 4ce40f5aca24
b: versions differ -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -470,11 +470,11 @@
updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 0b76e65c8289+ other b at 4ce40f5aca24 ancestor b at 000000000000
+filemerge: my b at 0b76e65c8289+ ancestor b at 000000000000 other b at 4ce40f5aca24
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 0b76e65c8289+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
+filemerge: my rev at 0b76e65c8289+ ancestor rev at 924404dff337 other rev at 4ce40f5aca24
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -489,7 +489,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a
+ local 02963e448370+ ancestor 924404dff337 remote 8dbce441892a
b: versions differ -> m
rev: versions differ -> m
remote changed a which local deleted
@@ -502,11 +502,11 @@
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 02963e448370+ other b at 8dbce441892a ancestor b at 000000000000
+filemerge: my b at 02963e448370+ ancestor b at 000000000000 other b at 8dbce441892a
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 02963e448370+ other rev at 8dbce441892a ancestor rev at 924404dff337
+filemerge: my rev at 02963e448370+ ancestor rev at 924404dff337 other rev at 8dbce441892a
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -521,7 +521,7 @@
searching for copies back to rev 1
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a
+ local 0b76e65c8289+ ancestor 924404dff337 remote bdb19105162a
local changed a which remote deleted
use (c)hanged version or (d)elete? c
a: prompt keep -> a
@@ -533,11 +533,11 @@
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b at 0b76e65c8289+ other b at bdb19105162a ancestor b at 000000000000
+filemerge: my b at 0b76e65c8289+ ancestor b at 000000000000 other b at bdb19105162a
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 0b76e65c8289+ other rev at bdb19105162a ancestor rev at 924404dff337
+filemerge: my rev at 0b76e65c8289+ ancestor rev at 924404dff337 other rev at bdb19105162a
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -557,7 +557,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493
+ local e300d1c794ec+ ancestor 924404dff337 remote 49b6d8032493
rev: versions differ -> m
a: remote moved to b -> m
preserving a for resolve of b
@@ -566,11 +566,11 @@
updating: a 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
-my b at e300d1c794ec+ other b at 49b6d8032493 ancestor a at 924404dff337
+filemerge: my b at e300d1c794ec+ ancestor a at 924404dff337 other b at 49b6d8032493
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at e300d1c794ec+ other rev at 49b6d8032493 ancestor rev at 924404dff337
+filemerge: my rev at e300d1c794ec+ ancestor rev at 924404dff337 other rev at 49b6d8032493
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -590,7 +590,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71
+ local 62e7bf090eba+ ancestor 924404dff337 remote f4db7e329e71
b: local copied/moved to a -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -598,11 +598,11 @@
updating: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
-my b at 62e7bf090eba+ other a at f4db7e329e71 ancestor a at 924404dff337
+filemerge: my b at 62e7bf090eba+ ancestor a at 924404dff337 other a at f4db7e329e71
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 62e7bf090eba+ other rev at f4db7e329e71 ancestor rev at 924404dff337
+filemerge: my rev at 62e7bf090eba+ ancestor rev at 924404dff337 other rev at f4db7e329e71
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
@@ -624,7 +624,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local 02963e448370+ remote 2b958612230f
+ local 02963e448370+ ancestor 924404dff337 remote 2b958612230f
b: local copied/moved to a -> m
rev: versions differ -> m
c: remote created -> g
@@ -633,14 +633,14 @@
updating: b 1/3 files (33.33%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
-my b at 02963e448370+ other a at 2b958612230f ancestor a at 924404dff337
+filemerge: my b at 02963e448370+ ancestor a at 924404dff337 other a at 2b958612230f
premerge successful
updating: c 2/3 files (66.67%)
getting c
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev at 02963e448370+ other rev at 2b958612230f ancestor rev at 924404dff337
+filemerge: my rev at 02963e448370+ ancestor rev at 924404dff337 other rev at 2b958612230f
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------
diff -r 478385c46665 -r 073d7c08c487 tests/test-subrepo.t
--- a/tests/test-subrepo.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-subrepo.t Wed Sep 15 15:50:17 2010 +0200
@@ -171,7 +171,7 @@
searching for copies back to rev 2
resolving manifests
overwrite None partial False
- ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
+ local f0d2028bf86d+ ancestor 1f14a2e2d3ec remote 1831e14459c4
.hgsubstate: versions differ -> m
updating: .hgsubstate 1/1 files (100.00%)
subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
@@ -179,7 +179,7 @@
getting subrepo t
resolving manifests
overwrite True partial False
- ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
+ local 60ca1237c194+ ancestor 60ca1237c194+ remote 6747d179aa9a
t: remote is newer -> g
updating: t 1/1 files (100.00%)
getting t
@@ -199,7 +199,7 @@
searching for copies back to rev 2
resolving manifests
overwrite None partial False
- ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
+ local e45c8b14af55+ ancestor 1831e14459c4 remote f94576341bcf
.hgsubstate: versions differ -> m
updating: .hgsubstate 1/1 files (100.00%)
subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
@@ -208,13 +208,13 @@
searching for copies back to rev 2
resolving manifests
overwrite None partial False
- ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
+ local 20a0db6fbf6c+ ancestor 6747d179aa9a remote 7af322bc1198
t: versions differ -> m
preserving t for resolve of t
updating: t 1/1 files (100.00%)
picked tool 'internal:merge' for t (binary False symlink False)
merging t
- my t at 20a0db6fbf6c+ other t at 7af322bc1198 ancestor t at 6747d179aa9a
+ filemerge: my t at 20a0db6fbf6c+ ancestor t at 6747d179aa9a other t at 7af322bc1198
warning: conflicts during merge.
merging t failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
diff -r 478385c46665 -r 073d7c08c487 tests/test-up-local-change.t
--- a/tests/test-up-local-change.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-up-local-change.t Wed Sep 15 15:50:17 2010 +0200
@@ -46,14 +46,14 @@
b
resolving manifests
overwrite False partial False
- ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
+ local c19d34741b0a+ ancestor c19d34741b0a remote 1e71731e6fbb
a: versions differ -> m
b: remote created -> g
preserving a for resolve of a
updating: a 1/2 files (50.00%)
picked tool 'true' for a (binary False symlink False)
merging a
- my a at c19d34741b0a+ other a at 1e71731e6fbb ancestor a at c19d34741b0a
+ filemerge: my a at c19d34741b0a+ ancestor a at c19d34741b0a other a at 1e71731e6fbb
updating: b 2/2 files (100.00%)
getting b
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -67,7 +67,7 @@
$ hg --debug up 0
resolving manifests
overwrite False partial False
- ancestor 1e71731e6fbb local 1e71731e6fbb+ remote c19d34741b0a
+ local 1e71731e6fbb+ ancestor 1e71731e6fbb remote c19d34741b0a
a: versions differ -> m
b: other deleted -> r
preserving a for resolve of a
@@ -76,7 +76,7 @@
updating: a 2/2 files (100.00%)
picked tool 'true' for a (binary False symlink False)
merging a
- my a at 1e71731e6fbb+ other a at c19d34741b0a ancestor a at 1e71731e6fbb
+ filemerge: my a at 1e71731e6fbb+ ancestor a at 1e71731e6fbb other a at c19d34741b0a
0 files updated, 1 files merged, 1 files removed, 0 files unresolved
$ hg parents
changeset: 0:c19d34741b0a
@@ -99,14 +99,14 @@
b
resolving manifests
overwrite False partial False
- ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
+ local c19d34741b0a+ ancestor c19d34741b0a remote 1e71731e6fbb
a: versions differ -> m
b: remote created -> g
preserving a for resolve of a
updating: a 1/2 files (50.00%)
picked tool 'true' for a (binary False symlink False)
merging a
- my a at c19d34741b0a+ other a at 1e71731e6fbb ancestor a at c19d34741b0a
+ filemerge: my a at c19d34741b0a+ ancestor a at c19d34741b0a other a at 1e71731e6fbb
updating: b 2/2 files (100.00%)
getting b
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -176,7 +176,7 @@
searching for copies back to rev 1
resolving manifests
overwrite False partial False
- ancestor c19d34741b0a local 1e71731e6fbb+ remote 83c51d0caff4
+ local 1e71731e6fbb+ ancestor c19d34741b0a remote 83c51d0caff4
a: versions differ -> m
b: versions differ -> m
preserving a for resolve of a
@@ -184,11 +184,11 @@
updating: a 1/2 files (50.00%)
picked tool 'true' for a (binary False symlink False)
merging a
- my a at 1e71731e6fbb+ other a at 83c51d0caff4 ancestor a at c19d34741b0a
+ filemerge: my a at 1e71731e6fbb+ ancestor a at c19d34741b0a other a at 83c51d0caff4
updating: b 2/2 files (100.00%)
picked tool 'true' for b (binary False symlink False)
merging b
- my b at 1e71731e6fbb+ other b at 83c51d0caff4 ancestor b at 000000000000
+ filemerge: my b at 1e71731e6fbb+ ancestor b at 000000000000 other b at 83c51d0caff4
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg parents
diff -r 478385c46665 -r 073d7c08c487 tests/test-update-reverse.t
--- a/tests/test-update-reverse.t Fri Sep 10 10:28:18 2010 +0200
+++ b/tests/test-update-reverse.t Wed Sep 15 15:50:17 2010 +0200
@@ -67,7 +67,7 @@
$ hg update --debug -C 1
resolving manifests
overwrite True partial False
- ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf
+ local 91ebc10ed028+ ancestor 91ebc10ed028+ remote 71a760306caf
side2: other deleted -> r
side1: other deleted -> r
main: remote created -> g
More information about the Mercurial-devel
mailing list