--- a/tests/test-graft.t Thu May 15 02:14:59 2014 +0200
+++ b/tests/test-graft.t Tue Apr 22 02:10:25 2014 +0200
@@ -137,8 +137,8 @@
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
+ preserving b for resolve of b
b: local copied/moved from a -> m
- preserving b for resolve of b
updating: b 1/1 files (100.00%)
picked tool 'internal:merge' for b (binary False symlink False)
merging b and a to b
@@ -151,21 +151,21 @@
branchmerge: True, force: True, partial: False
ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
e: remote is newer -> g
- b: keep -> k
getting e
updating: e 1/1 files (100.00%)
+ b: keep -> k
e
grafting revision 4
searching for copies back to rev 1
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
+ preserving e for resolve of e
d: remote is newer -> g
+ getting d
+ updating: d 1/2 files (50.00%)
b: keep -> k
e: versions differ -> m
- preserving e for resolve of e
- getting d
- updating: d 1/2 files (50.00%)
updating: e 2/2 files (100.00%)
picked tool 'internal:merge' for e (binary False symlink False)
merging e