3 + mkdir t |
3 + mkdir t |
4 + cd t |
4 + cd t |
5 + hg init |
5 + hg init |
6 + echo This is file a1 |
6 + echo This is file a1 |
7 + hg add a |
7 + hg add a |
8 + hg commit -t 'commit #0' -d '0 0' -u user |
8 + hg commit -m 'commit #0' -d '0 0' |
9 + echo This is file b1 |
9 + echo This is file b1 |
10 + hg add b |
10 + hg add b |
11 + hg commit -t 'commit #1' -d '0 0' -u user |
11 + hg commit -m 'commit #1' -d '0 0' |
12 + hg update 0 |
12 + hg update 0 |
13 + echo This is file c1 |
13 + echo This is file c1 |
14 + hg add c |
14 + hg add c |
15 + hg commit -t 'commit #2' -d '0 0' -u user |
15 + hg commit -m 'commit #2' -d '0 0' |
16 + echo This is file b1 |
16 + echo This is file b1 |
17 + env HGMERGE=../merge hg update -m 1 |
17 + env HGMERGE=../merge hg update -m 1 |
18 + cd .. |
18 + cd .. |
19 + /bin/rm -rf t |
19 + /bin/rm -rf t |
20 + mkdir t |
20 + mkdir t |
21 + cd t |
21 + cd t |
22 + hg init |
22 + hg init |
23 + echo This is file a1 |
23 + echo This is file a1 |
24 + hg add a |
24 + hg add a |
25 + hg commit -t 'commit #0' -d '0 0' -u user |
25 + hg commit -m 'commit #0' -d '0 0' |
26 + echo This is file b1 |
26 + echo This is file b1 |
27 + hg add b |
27 + hg add b |
28 + hg commit -t 'commit #1' -d '0 0' -u user |
28 + hg commit -m 'commit #1' -d '0 0' |
29 + hg update 0 |
29 + hg update 0 |
30 + echo This is file c1 |
30 + echo This is file c1 |
31 + hg add c |
31 + hg add c |
32 + hg commit -t 'commit #2' -d '0 0' -u user |
32 + hg commit -m 'commit #2' -d '0 0' |
33 + echo This is file b2 |
33 + echo This is file b2 |
34 + env HGMERGE=../merge hg update -m 1 |
34 + env HGMERGE=../merge hg update -m 1 |
35 merging for b |
35 merging for b |
36 merging b |
36 merging b |
37 + cd .. |
37 + cd .. |
39 + mkdir t |
39 + mkdir t |
40 + cd t |
40 + cd t |
41 + hg init |
41 + hg init |
42 + echo This is file a1 |
42 + echo This is file a1 |
43 + hg add a |
43 + hg add a |
44 + hg commit -t 'commit #0' -d '0 0' -u user |
44 + hg commit -m 'commit #0' -d '0 0' |
45 + echo This is file b1 |
45 + echo This is file b1 |
46 + hg add b |
46 + hg add b |
47 + hg commit -t 'commit #1' -d '0 0' -u user |
47 + hg commit -m 'commit #1' -d '0 0' |
48 + echo This is file b22 |
48 + echo This is file b22 |
49 + hg commit -t 'commit #2' -d '0 0' -u user |
49 + hg commit -m 'commit #2' -d '0 0' |
50 + hg update 1 |
50 + hg update 1 |
51 + echo This is file c1 |
51 + echo This is file c1 |
52 + hg add c |
52 + hg add c |
53 + hg commit -t 'commit #3' -d '0 0' -u user |
53 + hg commit -m 'commit #3' -d '0 0' |
54 + cat b |
54 + cat b |
55 This is file b1 |
55 This is file b1 |
56 + echo This is file b22 |
56 + echo This is file b22 |
57 + env HGMERGE=../merge hg update -m 2 |
57 + env HGMERGE=../merge hg update -m 2 |
58 merging for b |
58 merging for b |
62 + mkdir t |
62 + mkdir t |
63 + cd t |
63 + cd t |
64 + hg init |
64 + hg init |
65 + echo This is file a1 |
65 + echo This is file a1 |
66 + hg add a |
66 + hg add a |
67 + hg commit -t 'commit #0' -d '0 0' -u user |
67 + hg commit -m 'commit #0' -d '0 0' |
68 + echo This is file b1 |
68 + echo This is file b1 |
69 + hg add b |
69 + hg add b |
70 + hg commit -t 'commit #1' -d '0 0' -u user |
70 + hg commit -m 'commit #1' -d '0 0' |
71 + echo This is file b22 |
71 + echo This is file b22 |
72 + hg commit -t 'commit #2' -d '0 0' -u user |
72 + hg commit -m 'commit #2' -d '0 0' |
73 + hg update 1 |
73 + hg update 1 |
74 + echo This is file c1 |
74 + echo This is file c1 |
75 + hg add c |
75 + hg add c |
76 + hg commit -t 'commit #3' -d '0 0' -u user |
76 + hg commit -m 'commit #3' -d '0 0' |
77 + echo This is file b33 |
77 + echo This is file b33 |
78 + env HGMERGE=../merge hg update -m 2 |
78 + env HGMERGE=../merge hg update -m 2 |
79 merging for b |
79 merging for b |
80 merging b |
80 merging b |
81 + cd .. |
81 + cd .. |