Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-pull @ 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 | 385b06493465 397b62d5dd13 |
line wrap: on
line source
#!/bin/sh mkdir test cd test echo foo>foo hg init hg addremove hg commit -m 1 hg verify hg serve -p 20059 > /dev/null & sleep 1 # wait for server to be started cd .. hg clone http://localhost:20059/ copy cd copy hg verify hg co cat foo hg manifest hg pull kill $!