--- a/tests/test-rename-merge2.t Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-rename-merge2.t Sat Feb 09 15:22:04 2013 -0800
@@ -126,8 +126,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ getting a
updating: a 1/3 files (33.33%)
- getting a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b and a to b
@@ -231,8 +231,8 @@
b: remote created -> g
rev: versions differ -> m
preserving rev for resolve of rev
+ getting b
updating: b 1/2 files (50.00%)
- getting b
updating: rev 2/2 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
@@ -289,10 +289,10 @@
b: remote created -> g
rev: versions differ -> m
preserving rev for resolve of rev
+ removing a
updating: a 1/3 files (33.33%)
- removing a
+ getting b
updating: b 2/3 files (66.67%)
- getting b
updating: rev 3/3 files (100.00%)
picked tool 'python ../merge' for rev (binary False symlink False)
merging rev
@@ -380,12 +380,12 @@
c: remote created -> g
rev: versions differ -> m
preserving rev for resolve of rev
- updating: a 1/3 files (33.33%)
+ getting c
+ updating: c 1/3 files (33.33%)
+ updating: a 2/3 files (66.67%)
note: possible conflict - a was renamed multiple times to:
b
c
- 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
@@ -439,8 +439,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ removing a
updating: a 1/3 files (33.33%)
- removing a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -469,8 +469,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ getting a
updating: a 1/3 files (33.33%)
- getting a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -500,8 +500,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ removing a
updating: a 1/3 files (33.33%)
- removing a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -530,8 +530,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ getting a
updating: a 1/3 files (33.33%)
- getting a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -591,8 +591,8 @@
preserving b for resolve of b
rev: versions differ -> m
preserving rev for resolve of rev
+ getting a
updating: a 1/3 files (33.33%)
- getting a
updating: b 2/3 files (66.67%)
picked tool 'python ../merge' for b (binary False symlink False)
merging b
@@ -731,13 +731,13 @@
c: remote created -> g
rev: versions differ -> m
preserving rev for resolve of rev
- updating: b 1/3 files (33.33%)
+ getting c
+ updating: c 1/3 files (33.33%)
+ 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@02963e448370+ other a@2b958612230f ancestor a@924404dff337
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