Mercurial > hg > mercurial-crew-with-dirclash
annotate 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 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
522
diff
changeset
|
1 #!/bin/sh |
336 | 2 |
3 mkdir test | |
4 cd test | |
5 echo foo>foo | |
6 hg init | |
7 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
642
diff
changeset
|
8 hg commit -m 1 |
336 | 9 hg verify |
642 | 10 hg serve -p 20059 > /dev/null & |
790
d7380783a086
Make test-pull work on slow machines, where hg serve needs some time to start.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
11 sleep 1 # wait for server to be started |
336 | 12 cd .. |
13 | |
485 | 14 hg clone http://localhost:20059/ copy |
336 | 15 cd copy |
16 hg verify | |
17 hg co | |
18 cat foo | |
19 hg manifest | |
522
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
495
diff
changeset
|
20 hg pull |
336 | 21 |
492
9bd468e36de3
Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
22 kill $! |