| author | mpm@selenic.com |
| Thu, 21 Jul 2005 15:05:17 -0500 | |
| changeset 749 | 7e4843b7efd2 |
| parent 591 | eb46971fc57f |
| child 774 | 6592c4f5cd4f |
| child 793 | 445970ccf57a |
| permissions | -rwxr-xr-x |
|
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 |
16 |
sed "s/\(\(---\|+++\).*\)\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 |
32 |
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d |
|
| 331 | 33 |