--- a/tests/test-rename-dir-merge.t Fri Feb 28 02:38:33 2014 +0100
+++ b/tests/test-rename-dir-merge.t Sun Mar 02 18:49:36 2014 +0100
@@ -41,16 +41,16 @@
ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740
a/a: other deleted -> r
a/b: other deleted -> r
- a/c: remote renamed directory to b/c -> d
b/a: remote created -> g
b/b: remote created -> g
+ b/c: remote directory rename - move from a/c -> dm
removing a/a
removing a/b
updating: a/b 2/5 files (40.00%)
getting b/a
getting b/b
updating: b/b 4/5 files (80.00%)
- updating: a/c 5/5 files (100.00%)
+ updating: b/c 5/5 files (100.00%)
moving a/c to b/c (glob)
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -88,8 +88,8 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb
- None: local renamed directory to b/c -> d
- updating:None 1/1 files (100.00%)
+ b/c: local directory rename - get from a/c -> dg
+ updating: b/c 1/1 files (100.00%)
getting a/c to b/c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)