author | Matt Mackall <mpm@selenic.com> |
Wed, 26 Oct 2005 16:32:50 -0700 | |
changeset 1456 | 214f42f23a3b |
parent 1236 | 67a28636ea64 |
child 1581 | db10b7114de0 |
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 |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
2 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
3 |
cat <<'EOF' > merge |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
4 |
#!/bin/sh |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
5 |
echo merging for `basename $1` |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
6 |
EOF |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
7 |
chmod +x merge |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
8 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
9 |
mkdir t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
10 |
cd t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
11 |
hg init |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
12 |
echo This is file a1 > a |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
13 |
hg add a |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
14 |
hg commit -m "commit #0" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
15 |
echo This is file b1 > b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
16 |
hg add b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
17 |
hg commit -m "commit #1" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
18 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
19 |
hg update 0 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
20 |
echo This is file c1 > c |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
21 |
hg add c |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
22 |
hg commit -m "commit #2" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
23 |
echo This is file b1 > b |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
24 |
echo %% no merges expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
25 |
env HGMERGE=../merge hg update -m 1 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
26 |
cd ..; /bin/rm -rf t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
27 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
28 |
mkdir t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
29 |
cd t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
30 |
hg init |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
31 |
echo This is file a1 > a |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
32 |
hg add a |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
33 |
hg commit -m "commit #0" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
34 |
echo This is file b1 > b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
35 |
hg add b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
36 |
hg commit -m "commit #1" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
37 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
38 |
hg update 0 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
39 |
echo This is file c1 > c |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
40 |
hg add c |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
41 |
hg commit -m "commit #2" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
42 |
echo This is file b2 > b |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
43 |
echo %% merge of b expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
44 |
env HGMERGE=../merge hg update -m 1 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
45 |
cd ..; /bin/rm -rf t |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
46 |
echo %% |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
47 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
48 |
mkdir t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
49 |
cd t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
50 |
hg init |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
51 |
echo This is file a1 > a |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
52 |
hg add a |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
53 |
hg commit -m "commit #0" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
54 |
echo This is file b1 > b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
55 |
hg add b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
56 |
hg commit -m "commit #1" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
57 |
echo This is file b22 > b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
58 |
hg commit -m "commit #2" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
59 |
hg update 1 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
60 |
echo This is file c1 > c |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
61 |
hg add c |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
62 |
hg commit -m "commit #3" -d "0 0" |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
63 |
|
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
64 |
echo 'Contents of b should be "this is file b1"' |
430 | 65 |
cat b |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
66 |
|
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
67 |
echo This is file b22 > b |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
68 |
echo %% merge expected! |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
69 |
env HGMERGE=../merge hg update -m 2 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
70 |
cd ..; /bin/rm -rf t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
71 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
72 |
mkdir t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
73 |
cd t |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
74 |
hg init |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
75 |
echo This is file a1 > a |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
76 |
hg add a |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
77 |
hg commit -m "commit #0" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
78 |
echo This is file b1 > b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
79 |
hg add b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
80 |
hg commit -m "commit #1" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
81 |
echo This is file b22 > b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
82 |
hg commit -m "commit #2" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
83 |
hg update 1 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
84 |
echo This is file c1 > c |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
85 |
hg add c |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
430
diff
changeset
|
86 |
hg commit -m "commit #3" -d "0 0" |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
87 |
echo This is file b33 > b |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
814
diff
changeset
|
88 |
echo %% merge of b expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
89 |
env HGMERGE=../merge hg update -m 2 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
90 |
cd ..; /bin/rm -rf t |