Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-empty-dir @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 08 Oct 2006 19:57:45 -0500 |
| parents | 7544700fd931 |
| children | 7012c889e8f2 |
| rev | line source |
|---|---|
| 578 | 1 #!/bin/sh |
| 2 | |
| 3 hg init | |
| 4 echo 123 > a | |
| 5 hg add a | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1926
diff
changeset
|
6 hg commit -m "first" -d "1000000 0" a |
| 578 | 7 mkdir sub |
| 8 echo 321 > sub/b | |
| 9 hg add sub/b | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1926
diff
changeset
|
10 hg commit -m "second" -d "1000000 0" sub/b |
| 578 | 11 cat sub/b |
| 12 hg co 0 | |
|
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
13 cat sub/b 2>/dev/null || echo "sub/b not present" |
|
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
14 ls sub 2>/dev/null || echo "sub not present" |
| 578 | 15 |
| 16 true |