# HG changeset patch # User Thomas Arendsen Hein # Date 1164984023 -3600 # Node ID 7b88bd88f0403dc1f19be2ae5e1aa503b648f333 # Parent b5c4d749f37f3069a7111d144cdab53a6cbfa7c6 Fix test-rename-dir-merge for different implementations of ls. diff --git a/tests/test-rename-dir-merge b/tests/test-rename-dir-merge --- a/tests/test-rename-dir-merge +++ b/tests/test-rename-dir-merge @@ -21,12 +21,12 @@ hg add a/c hg ci -m "2 add a/c" -d "0 0" hg merge --debug 1 -ls a/ b/ +echo a/* b/* hg st -C hg ci -m "3 merge 2+1" -d "0 0" hg co -C 1 hg merge --debug 2 -ls a/ b/ +echo a/* b/* hg st -C hg ci -m "4 merge 1+2" -d "0 0" diff --git a/tests/test-rename-dir-merge.out b/tests/test-rename-dir-merge.out --- a/tests/test-rename-dir-merge.out +++ b/tests/test-rename-dir-merge.out @@ -21,11 +21,7 @@ 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) -ls: a/: No such file or directory -b/: -a -b -c +a/* b/a b/b b/c M b/a M b/b A b/c @@ -41,10 +37,6 @@ resolving manifests 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) -ls: a/: No such file or directory -b/: -a -b -c +a/* b/a b/b b/c A b/c a/c