Mercurial > hg > pyhgsh
annotate tests/test-up-local-change @ 953:52d8d81e72ad
Merge with TAH
| author | mpm@selenic.com |
|---|---|
| date | Fri, 19 Aug 2005 16:45:25 -0800 |
| parents | 0902ffece4b4 d997148155f2 |
| children | 4f81068ed8cd |
| 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 |
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
3 set -e |
| 331 | 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 | |
| 949 | 15 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
| 16 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
| 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 | |
| 949 | 31 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
| 32 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
| 331 | 33 |