annotate tests/test-simple-update @ 349:b2293093b89e
Merged with mercurial-identify (which includes upstream's current tip)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merged with mercurial-identify (which includes upstream's current tip)
manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO
yZTmrT6p+gt6GBO+j5FVBn0=
=HWn8
-----END PGP SIGNATURE-----
author |
Thomas Arendsen Hein <thomas@intevation.de> |
date |
Wed, 15 Jun 2005 08:32:29 +0100 |
parents |
55f63f3b6a54 |
children |
b4e0e20646bb |
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 |