--- a/tests/test-rename-merge2.out Sun Feb 03 19:29:05 2008 -0600
+++ b/tests/test-rename-merge2.out Sun Feb 03 19:29:05 2008 -0600
@@ -13,8 +13,11 @@
rev: versions differ -> m
a: remote copied to b -> m
copying a to b
+picked tool 'python ../merge' for a (binary False symlink False)
merging a and b
my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
+ premerge successful
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -41,8 +44,11 @@
b: local copied to a -> m
rev: versions differ -> m
getting a
+picked tool 'python ../merge' for b (binary False symlink False)
merging b and a
my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337
+ premerge successful
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -68,9 +74,12 @@
rev: versions differ -> m
a: remote moved to b -> m
copying a to b
+picked tool 'python ../merge' for a (binary False symlink False)
merging a and b
my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
+ premerge successful
removing a
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -94,8 +103,11 @@
checking for directory renames
b: local moved to a -> m
rev: versions differ -> m
+picked tool 'python ../merge' for b (binary False symlink False)
merging b and a
my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
+ premerge successful
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -120,6 +132,7 @@
rev: versions differ -> m
b: remote created -> g
getting b
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -142,6 +155,7 @@
b -> a
checking for directory renames
rev: versions differ -> m
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -168,6 +182,7 @@
b: remote created -> g
removing a
getting b
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
1 files updated, 1 files merged, 1 files removed, 0 files unresolved
@@ -189,6 +204,7 @@
b -> a
checking for directory renames
rev: versions differ -> m
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -206,8 +222,10 @@
searching for copies back to rev 1
b: versions differ -> m
rev: versions differ -> m
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -238,6 +256,7 @@
b
c
getting c
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -256,8 +275,10 @@
searching for copies back to rev 1
b: versions differ -> m
rev: versions differ -> m
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -278,8 +299,10 @@
b: versions differ -> m
rev: versions differ -> m
removing a
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
@@ -299,8 +322,10 @@
b: versions differ -> m
rev: versions differ -> m
getting a
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -321,8 +346,10 @@
b: versions differ -> m
rev: versions differ -> m
removing a
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
@@ -342,8 +369,10 @@
b: versions differ -> m
rev: versions differ -> m
getting a
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -362,8 +391,10 @@
searching for copies back to rev 1
b: versions differ -> m
rev: versions differ -> m
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -384,8 +415,10 @@
rev: versions differ -> m
a: prompt recreating -> g
getting a
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -404,8 +437,10 @@
searching for copies back to rev 1
b: versions differ -> m
rev: versions differ -> m
+picked tool 'python ../merge' for b (binary False symlink False)
merging b
my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -430,9 +465,11 @@
rev: versions differ -> m
a: remote moved to b -> m
copying a to b
+picked tool 'python ../merge' for a (binary False symlink False)
merging a and b
my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
removing a
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -456,8 +493,10 @@
checking for directory renames
b: local moved to a -> m
rev: versions differ -> m
+picked tool 'python ../merge' for b (binary False symlink False)
merging b and a
my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
@@ -484,9 +523,12 @@
b: local moved to a -> m
rev: versions differ -> m
c: remote created -> g
+picked tool 'python ../merge' for b (binary False symlink False)
merging b and a
my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337
+ premerge successful
getting c
+picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337
1 files updated, 2 files merged, 0 files removed, 0 files unresolved