Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simple-update @ 380:c72ccad3e3b8
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: 18cf61cc2b6611d74ffc490b6b733537b879d69e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsQy7ywK+sNU5EO8RAoi/AKCC0XbK73oemLr52KOQWEK4WlE9pgCgkk/8
C/m6MZJqlOKhIT4jazPwngU=
=ECGy
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 21:23:07 -0800 |
parents | b4e0e20646bb |
children | c5705ab9cebd |
rev | line source |
---|---|
331 | 1 #!/bin/bash |
2 | |
3 set -ex | |
4 | |
5 mkdir test | |
6 cd test | |
7 echo foo>foo | |
8 hg init | |
9 hg addremove | |
10 hg commit -t "1" | |
11 hg verify | |
12 cd .. | |
13 | |
14 mkdir branch | |
15 cd branch | |
16 hg init ../test | |
17 hg co | |
18 echo bar>>foo | |
19 hg commit -t "2" | |
20 | |
21 cd ../test | |
22 hg pull ../branch | |
23 hg verify | |
24 hg co | |
25 cat foo | |
26 hg manifest |