annotate tests/test-simple-update @ 464:50da4bb9cab6
Merge from http://moffetthome.net:8012/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge from http://moffetthome.net:8012/
manifest hash: 3a67864af6b0276eabe640274633ca2625dbd4a5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQKkywK+sNU5EO8RArUHAKCSGtpEfJwYGoAIpj4mBDvcPted9wCgnzML
xr8WQ8DdPkJ9DVsLjvsbhJU=
=O7Fd
-----END PGP SIGNATURE-----
author |
mpm@selenic.com |
date |
Fri, 24 Jun 2005 23:07:16 -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 |