author | mpm@selenic.com |
Sat, 02 Jul 2005 12:27:27 -0800 | |
changeset 569 | 3e347929f5f9 |
parent 547 | 4fc63e22b1fe |
child 591 | eb46971fc57f |
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 |
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 |