Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-up-local-change @ 779:b3c7cb74d325
Add paths command
The following patch adds the 'paths' commands to show a named path, or list of
available paths. In case anyone find it useful.
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Wed, 27 Jul 2005 08:19:59 -0800 |
parents | 6592c4f5cd4f |
children | 445970ccf57a 8f5637f0a0c0 0902ffece4b4 |
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 set -ex | |
4 mkdir r1 | |
5 cd r1 | |
6 hg init | |
7 echo a > a | |
8 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
9 hg commit -m "1" -d "0 0" |
331 | 10 |
485 | 11 hg clone . ../r2 |
12 cd ../r2 | |
331 | 13 hg up |
14 echo abc > a | |
332 | 15 hg diff > ../d |
774
6592c4f5cd4f
Change sed patterns in tests to strip dates after spaces or tabs
mpm@selenic.com
parents:
749
diff
changeset
|
16 sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d |
331 | 17 |
18 cd ../r1 | |
19 echo b > b | |
20 echo a2 > a | |
21 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
22 hg commit -m "2" -d "0 0" |
331 | 23 |
24 cd ../r2 | |
25 hg -q pull ../r1 | |
26 hg status | |
591 | 27 hg --debug up |
28 hg --debug up -m | |
331 | 29 hg parents |
30 hg -v history | |
332 | 31 hg diff > ../d |
774
6592c4f5cd4f
Change sed patterns in tests to strip dates after spaces or tabs
mpm@selenic.com
parents:
749
diff
changeset
|
32 sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d |
331 | 33 |