author | mpm@selenic.com |
Sat, 27 Aug 2005 18:11:32 -0700 | |
changeset 1110 | 1032a505488c |
parent 814 | 0902ffece4b4 |
child 1933 | 7544700fd931 |
permissions | -rwxr-xr-x |
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 |
#!/bin/sh |
616 | 2 |
|
3 |
cat <<'EOF' > merge |
|
4 |
#!/bin/sh |
|
5 |
echo merging for `basename $1` |
|
6 |
EOF |
|
7 |
chmod +x merge |
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
8 |
HGMERGE=./merge; export HGMERGE |
616 | 9 |
|
10 |
mkdir A1 |
|
11 |
cd A1 |
|
12 |
hg init |
|
13 |
echo This is file foo1 > foo |
|
14 |
echo This is file bar1 > bar |
|
15 |
hg add foo bar |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
619
diff
changeset
|
16 |
hg commit -m "commit text" -d "0 0" |
616 | 17 |
|
18 |
cd .. |
|
19 |
hg clone A1 B1 |
|
20 |
||
21 |
cd A1 |
|
22 |
rm bar |
|
23 |
hg remove bar |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
619
diff
changeset
|
24 |
hg commit -m "commit test" -d "0 0" |
616 | 25 |
|
26 |
cd ../B1 |
|
27 |
echo This is file foo22 > foo |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
619
diff
changeset
|
28 |
hg commit -m "commit test" -d "0 0" |
616 | 29 |
|
30 |
cd .. |
|
31 |
hg clone A1 A2 |
|
32 |
hg clone B1 B2 |
|
33 |
||
34 |
cd A1 |
|
35 |
hg pull ../B1 |
|
36 |
hg update -m |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
619
diff
changeset
|
37 |
hg commit -m "commit test" -d "0 0" |
616 | 38 |
echo bar should remain deleted. |
39 |
hg manifest |
|
40 |
||
41 |
cd ../B2 |
|
42 |
hg pull ../A2 |
|
43 |
hg update -m |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
619
diff
changeset
|
44 |
hg commit -m "commit test" -d "0 0" |
616 | 45 |
echo bar should remain deleted. |
46 |
hg manifest |