Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-simple-update @ 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 | ad3d5b4367cb |
line wrap: on
line source
#!/bin/sh set -e mkdir test cd test echo foo>foo hg init hg addremove hg commit -m "1" hg verify hg clone . ../branch cd ../branch hg co echo bar>>foo hg commit -m "2" cd ../test hg pull ../branch hg verify hg co cat foo hg manifest