Mercurial > hg

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
1 #!/bin/bash
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
2
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
3 mkdir test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
4 cd test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
5 echo foo>foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
6 hg init
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
7 hg addremove
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
8 hg commit -t "1"
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
9 hg verify
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset
10 hg serve -p 20059 2>/dev/null &
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
11 cd ..
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
12
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
13 mkdir copy
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
14 cd copy
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset
15 hg init http://localhost:20059/
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
16 hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
17 hg co
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
18 cat foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
19 hg manifest
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
20
392
ee4c80d294e5 Tidy up conflict and pull tests
mpm@selenic.com
parents: 382
diff changeset
21 kill %hg