--- a/tests/test-rename-dir-merge.out Tue Feb 16 23:28:46 2010 +0100
+++ b/tests/test-rename-dir-merge.out Tue Feb 16 21:04:04 2010 +0100
@@ -21,7 +21,7 @@
file a/d -> b/d
resolving manifests
overwrite None partial False
- ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
+ ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740
a/d: remote renamed directory to b/d -> d
a/c: remote renamed directory to b/c -> d
a/b: other deleted -> r
@@ -68,7 +68,7 @@
file a/c -> b/c
resolving manifests
overwrite None partial False
- ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
+ ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb
None: local renamed directory to b/c -> d
update:None 1/1 files (100.00%)
getting a/c to b/c