Mercurial > hg
comparison tests/test-rename-dir-merge @ 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 | 216e75c721d3 |
children | dee573ba79f1 |
comparison
equal
deleted
inserted
replaced
3747:b5c4d749f37f | 3748:7b88bd88f040 |
---|---|
19 echo baz > a/c | 19 echo baz > a/c |
20 hg add a/c | 20 hg add a/c |
21 hg ci -m "2 add a/c" -d "0 0" | 21 hg ci -m "2 add a/c" -d "0 0" |
22 | 22 |
23 hg merge --debug 1 | 23 hg merge --debug 1 |
24 ls a/ b/ | 24 echo a/* b/* |
25 hg st -C | 25 hg st -C |
26 hg ci -m "3 merge 2+1" -d "0 0" | 26 hg ci -m "3 merge 2+1" -d "0 0" |
27 | 27 |
28 hg co -C 1 | 28 hg co -C 1 |
29 hg merge --debug 2 | 29 hg merge --debug 2 |
30 ls a/ b/ | 30 echo a/* b/* |
31 hg st -C | 31 hg st -C |
32 hg ci -m "4 merge 1+2" -d "0 0" | 32 hg ci -m "4 merge 1+2" -d "0 0" |