Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-pull @ 392:ee4c80d294e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy up conflict and pull tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tidy up conflict and pull tests Fix failure to kill hg serve process and pipeline ordering with set -e manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg pI3IH2BvqUlckdLwx3M5jcQ= =s/QA -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 17 Jun 2005 08:50:55 -0800
parents 37249c522770
children c5705ab9cebd
comparison
equal deleted inserted replaced
391:5f65a108a559 392:ee4c80d294e5
1 #!/bin/bash 1 #!/bin/bash
2
3 set -e
4 2
5 mkdir test 3 mkdir test
6 cd test 4 cd test
7 echo foo>foo 5 echo foo>foo
8 hg init 6 hg init
9 hg addremove 7 hg addremove
10 hg commit -t "1" 8 hg commit -t "1"
11 hg verify 9 hg verify
12 hg serve -p 20059 2>/dev/null & 10 hg serve -p 20059 2>/dev/null &
13 C=$!
14 cd .. 11 cd ..
15 12
16 mkdir copy 13 mkdir copy
17 cd copy 14 cd copy
18 hg init http://localhost:20059/ 15 hg init http://localhost:20059/
19 hg verify 16 hg verify
20 hg co 17 hg co
21 cat foo 18 cat foo
22 hg manifest 19 hg manifest
23 20
24 kill $C 21 kill %hg