Mercurial > hg
comparison tests/test-fetch @ 7344:58fd3c718ca4
tests: add killdaemons helper script
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 07 Nov 2008 16:28:53 -0600 |
| parents | 6489ee64b522 |
| children | aa1a87f7544f |
comparison
equal
deleted
inserted
replaced
| 7343:e47dab64be8d | 7344:58fd3c718ca4 |
|---|---|
| 35 | 35 |
| 36 echo % should merge c into a | 36 echo % should merge c into a |
| 37 hg --cwd c fetch -d '4 0' -m 'automated merge' ../a | 37 hg --cwd c fetch -d '4 0' -m 'automated merge' ../a |
| 38 ls c | 38 ls c |
| 39 | 39 |
| 40 netstat -tnap 2>/dev/null | grep $HGPORT | grep LISTEN | |
| 40 hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid | 41 hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid |
| 41 cat a/hg.pid >> "$DAEMON_PIDS" | 42 cat a/hg.pid >> "$DAEMON_PIDS" |
| 42 | 43 |
| 43 echo '% fetch over http, no auth' | 44 echo '% fetch over http, no auth' |
| 44 hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ | hideport | hidehash | 45 hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ | hideport | hidehash |
| 167 hg -R n2 fetch -d '0 0' -m merge n1 | 168 hg -R n2 fetch -d '0 0' -m merge n1 |
| 168 echo '% parent should be 0 (fetch did not update or merge anything)' | 169 echo '% parent should be 0 (fetch did not update or merge anything)' |
| 169 hg -R n2 parents --template '{rev}\n' | 170 hg -R n2 parents --template '{rev}\n' |
| 170 rm -fr n1 n2 | 171 rm -fr n1 n2 |
| 171 | 172 |
| 173 "$TESTDIR/killdaemons.py" | |
| 174 | |
| 172 true | 175 true |