--- a/tests/test-rename-dir-merge.out
+++ b/tests/test-rename-dir-merge.out
@@ -9,6 +9,18 @@ 2 files updated, 0 files merged, 2 files
resolving manifests
overwrite None partial False
ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
+ searching for copies back to rev 1
+ unmatched files in local:
+ a/c
+ unmatched files in other:
+ b/a
+ b/b
+ all copies found (* = to merge, ! = divergent):
+ b/a -> a/a
+ b/b -> a/b
+ checking for directory renames
+ dir a/ -> b/
+ file a/c -> b/c
a/c: remote renamed directory to b/c -> d
a/b: other deleted -> r
a/a: other deleted -> r
@@ -34,6 +46,18 @@ 0 files updated, 0 files merged, 1 files
resolving manifests
overwrite None partial False
ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
+ searching for copies back to rev 1
+ unmatched files in local:
+ b/a
+ b/b
+ unmatched files in other:
+ a/c
+ all copies found (* = to merge, ! = divergent):
+ b/a -> a/a
+ b/b -> a/b
+ checking for directory renames
+ dir a/ -> b/
+ file a/c -> b/c
None: local renamed directory to b/c -> d
getting a/c to b/c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved