Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-pull @ 466:c084cfbb2389
Add hgmerge manpage
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add hgmerge manpage
- From Vincent Danjean
manifest hash: db96fb3109a588052b21e49df81cfe65c98e72d7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQT2ywK+sNU5EO8RAmuFAJ0TFJ7K88OP/dMJVcFtD6Tiuon8SwCgl+W+
4NgyQCJKwgfGF6nEhqJkgck=
=Ymjz
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 24 Jun 2005 23:17:10 -0800 |
parents | ee4c80d294e5 |
children | c5705ab9cebd |
rev | line source |
---|---|
336 | 1 #!/bin/bash |
2 | |
3 mkdir test | |
4 cd test | |
5 echo foo>foo | |
6 hg init | |
7 hg addremove | |
8 hg commit -t "1" | |
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 | 11 cd .. |
12 | |
13 mkdir copy | |
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 | 16 hg verify |
17 hg co | |
18 cat foo | |
19 hg manifest | |
20 | |
392 | 21 kill %hg |