Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-up-local-change @ 520:12b4b5612fe4
Add some TODO items
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add some TODO items
manifest hash: d188abf3c84b6ca98279b4bf053ce2844da83a03
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwvKyywK+sNU5EO8RAh9ZAJ9kYA0a/R7XynWqZGGr6JqUvXa37wCfd2a2
F9fCY85bSZgErvdrklP29bQ=
=FtlU
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 29 Jun 2005 11:12:50 -0800 |
parents | c5705ab9cebd |
children | 3d4d5f2aba9a 4fc63e22b1fe |
rev | line source |
---|---|
331 | 1 #!/bin/bash |
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 | |
29 hg -d up | |
30 hg -d up -m | |
31 hg parents | |
32 hg -v history | |
332 | 33 hg diff > ../d |
34 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | |
331 | 35 |