--- a/tests/test-rename-dir-merge Fri Nov 30 18:23:18 2007 +0100
+++ b/tests/test-rename-dir-merge Sat Dec 01 12:54:34 2007 -0600
@@ -7,9 +7,7 @@
mkdir a
echo foo > a/a
echo bar > a/b
-
-hg add a
-hg ci -m "0" -d "0 0"
+hg ci -Am "0" -d "0 0"
hg co -C 0
hg mv a b
@@ -17,6 +15,7 @@
hg co -C 0
echo baz > a/c
+echo quux > a/d
hg add a/c
hg ci -m "2 add a/c" -d "0 0"
--- a/tests/test-rename-dir-merge.out Fri Nov 30 18:23:18 2007 +0100
+++ b/tests/test-rename-dir-merge.out Sat Dec 01 12:54:34 2007 -0600
@@ -12,6 +12,7 @@
searching for copies back to rev 1
unmatched files in local:
a/c
+ a/d
unmatched files in other:
b/a
b/b
@@ -21,6 +22,8 @@
checking for directory renames
dir a/ -> b/
file a/c -> b/c
+ file a/d -> b/d
+ a/d: remote renamed directory to b/d -> d
a/c: remote renamed directory to b/c -> d
a/b: other deleted -> r
a/a: other deleted -> r
@@ -29,11 +32,12 @@
removing a/a
removing a/b
moving a/c to b/c
+moving a/d to b/d
getting b/a
getting b/b
-3 files updated, 0 files merged, 2 files removed, 0 files unresolved
+4 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
+a/* b/a b/b b/c b/d
M b/a
M b/b
A b/c
@@ -41,6 +45,7 @@
R a/a
R a/b
R a/c
+? b/d
b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
resolving manifests
@@ -50,6 +55,7 @@
unmatched files in local:
b/a
b/b
+ b/d
unmatched files in other:
a/c
all copies found (* = to merge, ! = divergent):
@@ -62,7 +68,8 @@
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)
-a/* b/a b/b b/c
+a/* b/a b/b b/c b/d
A b/c
a/c
+? b/d
b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88