equal
deleted
inserted
replaced
7 1 |
7 1 |
8 2 |
8 2 |
9 3 |
9 3 |
10 EOF |
10 EOF |
11 hg add test.txt |
11 hg add test.txt |
12 hg commit -m "Initial" -d "0 0" |
12 hg commit -m "Initial" -d "1000000 0" |
13 |
13 |
14 # clone |
14 # clone |
15 cd .. |
15 cd .. |
16 hg clone test-a test-b |
16 hg clone test-a test-b |
17 |
17 |
20 cat >test.txt <<"EOF" |
20 cat >test.txt <<"EOF" |
21 one |
21 one |
22 two |
22 two |
23 three |
23 three |
24 EOF |
24 EOF |
25 hg commit -m "Numbers as words" -d "0 0" |
25 hg commit -m "Numbers as words" -d "1000000 0" |
26 |
26 |
27 # change test-b |
27 # change test-b |
28 cd ../test-b |
28 cd ../test-b |
29 cat >test.txt <<"EOF" |
29 cat >test.txt <<"EOF" |
30 1 |
30 1 |
31 2.5 |
31 2.5 |
32 3 |
32 3 |
33 EOF |
33 EOF |
34 hg commit -m "2 -> 2.5" -d "0 0" |
34 hg commit -m "2 -> 2.5" -d "1000000 0" |
35 |
35 |
36 # now pull and merge from test-a |
36 # now pull and merge from test-a |
37 hg pull ../test-a |
37 hg pull ../test-a |
38 HGMERGE=merge hg update -m |
38 HGMERGE=merge hg update -m |
39 # resolve conflict |
39 # resolve conflict |
41 one |
41 one |
42 two-point-five |
42 two-point-five |
43 three |
43 three |
44 EOF |
44 EOF |
45 rm -f *.orig |
45 rm -f *.orig |
46 hg commit -m "Merge 1" -d "0 0" |
46 hg commit -m "Merge 1" -d "1000000 0" |
47 |
47 |
48 # change test-a again |
48 # change test-a again |
49 cd ../test-a |
49 cd ../test-a |
50 cat >test.txt <<"EOF" |
50 cat >test.txt <<"EOF" |
51 one |
51 one |
52 two-point-one |
52 two-point-one |
53 three |
53 three |
54 EOF |
54 EOF |
55 hg commit -m "two -> two-point-one" -d "0 0" |
55 hg commit -m "two -> two-point-one" -d "1000000 0" |
56 |
56 |
57 # pull and merge from test-a again |
57 # pull and merge from test-a again |
58 cd ../test-b |
58 cd ../test-b |
59 hg pull ../test-a |
59 hg pull ../test-a |
60 HGMERGE=merge hg update --debug -m |
60 HGMERGE=merge hg update --debug -m |