Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-empty-dir @ 1700:e2f91e0acbb8
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
| author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
|---|---|
| date | Mon, 06 Feb 2006 17:32:06 -0600 |
| parents | 0902ffece4b4 |
| children | ba198d17eea9 |
| rev | line source |
|---|---|
| 578 | 1 #!/bin/sh |
| 2 | |
| 3 hg init | |
| 4 echo 123 > a | |
| 5 hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
578
diff
changeset
|
6 hg commit -m "first" -d "0 0" a |
| 578 | 7 mkdir sub |
| 8 echo 321 > sub/b | |
| 9 hg add sub/b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
578
diff
changeset
|
10 hg commit -m "second" -d "0 0" sub/b |
| 578 | 11 cat sub/b |
| 12 hg co 0 | |
| 13 cat sub/b | |
| 14 ls sub | |
| 15 | |
| 16 true |