--- a/tests/test-rename-dir-merge.out Tue May 08 02:57:05 2007 -0500
+++ b/tests/test-rename-dir-merge.out Tue May 08 02:59:13 2007 -0500
@@ -10,39 +10,33 @@
overwrite None partial False
ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
a/c: remote renamed directory to b/c -> d
- a/a: remote moved to b/a -> m
- a/b: remote moved to b/b -> m
-copying a/a to b/a
+ a/b: other deleted -> r
+ a/a: other deleted -> r
+ b/a: remote created -> g
+ b/b: remote created -> g
removing a/a
-copying a/b to b/b
removing a/b
moving a/c to b/c
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+getting b/a
+getting b/b
+3 files updated, 0 files merged, 2 files removed, 0 files unresolved
(branch merge, don't forget to commit)
a/* b/a b/b b/c
M b/a
- a/a
M b/b
- a/b
A b/c
a/c
R a/a
R a/b
R a/c
-2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
resolving manifests
overwrite None partial False
ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
- b/a: local moved to a/a -> m
- b/b: local moved to a/b -> m
None: local renamed directory to b/c -> d
getting a/c to b/c
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
a/* b/a b/b b/c
-M b/a
- a/a
-M b/b
- a/b
A b/c
a/c