Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-up-local-change @ 620:7369ec5d93f2
Attempt to handle RSS URIs properly
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to handle RSS URIs properly
manifest hash: 1546939c11a8640ca56f0b0f5c7bdc878b4faa67
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCycliywK+sNU5EO8RAukgAJ9eoJdqTiTQ8xSsSeHMIBmHnnQk9QCfQpFL
SAJKUYknvv4IJDUyHjQc61k=
=zGdJ
-----END PGP SIGNATURE-----
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Jul 2005 15:42:26 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
1 #!/bin/sh |
331 | 2 |
3 export HGMERGE=true | |
4 | |
5 set -ex | |
6 mkdir r1 | |
7 cd r1 | |
8 hg init | |
9 echo a > a | |
10 hg addremove | |
11 hg commit -t "1" -u test -d "0 0" | |
12 | |
485 | 13 hg clone . ../r2 |
14 cd ../r2 | |
331 | 15 hg up |
16 echo abc > a | |
332 | 17 hg diff > ../d |
18 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | |
331 | 19 |
20 cd ../r1 | |
21 echo b > b | |
22 echo a2 > a | |
23 hg addremove | |
24 hg commit -t "2" -u test -d "0 0" | |
25 | |
26 cd ../r2 | |
27 hg -q pull ../r1 | |
28 hg status | |
591 | 29 hg --debug up |
30 hg --debug up -m | |
331 | 31 hg parents |
32 hg -v history | |
332 | 33 hg diff > ../d |
34 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | |
331 | 35 |