--- a/tests/test-rename-merge2.out Tue Feb 16 23:28:46 2010 +0100
+++ b/tests/test-rename-merge2.out Tue Feb 16 21:04:04 2010 +0100
@@ -10,7 +10,7 @@
checking for directory renames
resolving manifests
overwrite None partial False
- ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
+ ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24
rev: versions differ -> m
a: remote copied to b -> m
preserving a for resolve of b
@@ -18,12 +18,12 @@
update: a 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
-my b@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
+my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337
+my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
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 ac809aeed39a+ remote f4db7e329e71
+ ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71
a: remote is newer -> g
b: local copied/moved to a -> m
rev: versions differ -> m
@@ -55,12 +55,12 @@
update: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
-my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337
+my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
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 e03727d2d66b
+ ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a
rev: versions differ -> m
a: remote moved to b -> m
preserving a for resolve of b
@@ -90,12 +90,12 @@
update: a 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
-my b@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
+my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
premerge successful
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
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 ecf3cb2a4219+ remote f4db7e329e71
+ ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71
b: local copied/moved to a -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -123,12 +123,12 @@
update: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
-my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
+my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337
+my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
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 735846fee2d7
+ ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24
rev: versions differ -> m
b: remote created -> g
preserving rev for resolve of rev
@@ -157,7 +157,7 @@
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
+my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
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 ac809aeed39a+ remote 97c705ade336
+ ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336
rev: versions differ -> m
preserving rev for resolve of rev
update: rev 1/1 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
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 e03727d2d66b
+ ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a
a: other deleted -> r
rev: versions differ -> m
b: remote created -> g
@@ -215,7 +215,7 @@
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
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 ecf3cb2a4219+ remote 97c705ade336
+ ancestor 924404dff337 local 02963e448370+ remote 97c705ade336
rev: versions differ -> m
preserving rev for resolve of rev
update: rev 1/1 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337
+my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
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 ec03c2ca8642+ remote 79cc6877a3b7
+ ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493
b: versions differ -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -262,11 +262,11 @@
update: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337
+my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337
+my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
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 ecf3cb2a4219+ remote e6abcc1a30c2
+ ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e
rev: versions differ -> m
c: remote created -> g
preserving rev for resolve of rev
@@ -302,7 +302,7 @@
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337
+my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
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 ac809aeed39a+ remote af30c7647fc7
+ ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7
b: versions differ -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -325,11 +325,11 @@
update: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000
+my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
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 e03727d2d66b
+ ancestor 924404dff337 local 59318016310c+ remote bdb19105162a
a: other deleted -> r
b: versions differ -> m
rev: versions differ -> m
@@ -355,11 +355,11 @@
update: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
+my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
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 ac809aeed39a+ remote 8dbce441892a
+ ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a
a: remote is newer -> g
b: versions differ -> m
rev: versions differ -> m
@@ -384,11 +384,11 @@
update: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
+my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
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 e03727d2d66b
+ ancestor 924404dff337 local 59318016310c+ remote bdb19105162a
a: other deleted -> r
b: versions differ -> m
rev: versions differ -> m
@@ -414,11 +414,11 @@
update: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
+my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
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 ac809aeed39a+ remote 8dbce441892a
+ ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a
a: remote is newer -> g
b: versions differ -> m
rev: versions differ -> m
@@ -443,11 +443,11 @@
update: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
+my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
+my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
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 735846fee2d7
+ ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24
b: versions differ -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -470,11 +470,11 @@
update: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000
+my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337
+my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
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 ecf3cb2a4219+ remote 8dbce441892a
+ ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a
b: versions differ -> m
rev: versions differ -> m
remote changed a which local deleted
@@ -502,11 +502,11 @@
update: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000
+my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337
+my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
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 e03727d2d66b
+ ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a
local changed a which remote deleted
use (c)hanged version or (d)elete? c
a: prompt keep -> a
@@ -533,11 +533,11 @@
update: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
-my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000
+my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337
+my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
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 79cc6877a3b7
+ ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493
rev: versions differ -> m
a: remote moved to b -> m
preserving a for resolve of b
@@ -566,11 +566,11 @@
update: a 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging a and b to b
-my b@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
+my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337
+my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
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 ec03c2ca8642+ remote f4db7e329e71
+ ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71
b: local copied/moved to a -> m
rev: versions differ -> m
preserving b for resolve of b
@@ -598,11 +598,11 @@
update: b 1/2 files (50.00%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
-my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
+my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
update: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337
+my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
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 ecf3cb2a4219+ remote 2b958612230f
+ ancestor 924404dff337 local 02963e448370+ remote 2b958612230f
b: local copied/moved to a -> m
rev: versions differ -> m
c: remote created -> g
@@ -633,14 +633,14 @@
update: b 1/3 files (33.33%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
-my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337
+my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
premerge successful
update: c 2/3 files (66.67%)
getting c
update: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
-my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337
+my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
--------------