changeset 3748:7b88bd88f040

Fix test-rename-dir-merge for different implementations of ls.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 15:40:23 +0100
parents b5c4d749f37f
children f9567a7fa3b3
files tests/test-rename-dir-merge tests/test-rename-dir-merge.out
diffstat 2 files changed, 4 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-rename-dir-merge	Fri Dec 01 14:46:05 2006 +0100
+++ b/tests/test-rename-dir-merge	Fri Dec 01 15:40:23 2006 +0100
@@ -21,12 +21,12 @@
 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"
--- a/tests/test-rename-dir-merge.out	Fri Dec 01 14:46:05 2006 +0100
+++ b/tests/test-rename-dir-merge.out	Fri Dec 01 15:40:23 2006 +0100
@@ -21,11 +21,7 @@
 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 @@
 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