author | Jim Hague <jim.hague@acm.org> |
Fri, 19 Oct 2007 19:20:33 +0000 | |
changeset 5471 | 5b81c1cc6ebe |
parent 4295 | a74586023196 |
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 |
|
4295
a74586023196
test-merge6: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3736
diff
changeset
|
3 |
cat <<EOF > merge |
a74586023196
test-merge6: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3736
diff
changeset
|
4 |
import sys, os |
a74586023196
test-merge6: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3736
diff
changeset
|
5 |
print "merging for", os.path.basename(sys.argv[1]) |
616 | 6 |
EOF |
4295
a74586023196
test-merge6: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3736
diff
changeset
|
7 |
HGMERGE="python ../merge"; export HGMERGE |
616 | 8 |
|
9 |
mkdir A1 |
|
10 |
cd A1 |
|
11 |
hg init |
|
12 |
echo This is file foo1 > foo |
|
13 |
echo This is file bar1 > bar |
|
14 |
hg add foo bar |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
15 |
hg commit -m "commit text" -d "1000000 0" |
616 | 16 |
|
17 |
cd .. |
|
18 |
hg clone A1 B1 |
|
19 |
||
20 |
cd A1 |
|
21 |
rm bar |
|
22 |
hg remove bar |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
23 |
hg commit -m "commit test" -d "1000000 0" |
616 | 24 |
|
25 |
cd ../B1 |
|
26 |
echo This is file foo22 > foo |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
27 |
hg commit -m "commit test" -d "1000000 0" |
616 | 28 |
|
29 |
cd .. |
|
30 |
hg clone A1 A2 |
|
31 |
hg clone B1 B2 |
|
32 |
||
33 |
cd A1 |
|
34 |
hg pull ../B1 |
|
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
35 |
hg merge |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
36 |
hg commit -m "commit test" -d "1000000 0" |
616 | 37 |
echo bar should remain deleted. |
3736 | 38 |
hg manifest --debug |
616 | 39 |
|
40 |
cd ../B2 |
|
41 |
hg pull ../A2 |
|
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
42 |
hg merge |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
43 |
hg commit -m "commit test" -d "1000000 0" |
616 | 44 |
echo bar should remain deleted. |
3736 | 45 |
hg manifest --debug |