equal
deleted
inserted
replaced
19 hg update 0 |
19 hg update 0 |
20 echo This is file c1 > c |
20 echo This is file c1 > c |
21 hg add c |
21 hg add c |
22 hg commit -m "commit #2" -d "0 0" |
22 hg commit -m "commit #2" -d "0 0" |
23 echo This is file b1 > b |
23 echo This is file b1 > b |
|
24 echo %% no merges expected |
24 env HGMERGE=../merge hg update -m 1 |
25 env HGMERGE=../merge hg update -m 1 |
25 # no merges expected |
|
26 cd ..; /bin/rm -rf t |
26 cd ..; /bin/rm -rf t |
27 |
27 |
28 mkdir t |
28 mkdir t |
29 cd t |
29 cd t |
30 hg init |
30 hg init |
38 hg update 0 |
38 hg update 0 |
39 echo This is file c1 > c |
39 echo This is file c1 > c |
40 hg add c |
40 hg add c |
41 hg commit -m "commit #2" -d "0 0" |
41 hg commit -m "commit #2" -d "0 0" |
42 echo This is file b2 > b |
42 echo This is file b2 > b |
|
43 echo %% merge of b expected |
43 env HGMERGE=../merge hg update -m 1 |
44 env HGMERGE=../merge hg update -m 1 |
44 # merge of b expected |
|
45 cd ..; /bin/rm -rf t |
45 cd ..; /bin/rm -rf t |
|
46 echo %% |
46 |
47 |
47 mkdir t |
48 mkdir t |
48 cd t |
49 cd t |
49 hg init |
50 hg init |
50 echo This is file a1 > a |
51 echo This is file a1 > a |
57 hg commit -m "commit #2" -d "0 0" |
58 hg commit -m "commit #2" -d "0 0" |
58 hg update 1 |
59 hg update 1 |
59 echo This is file c1 > c |
60 echo This is file c1 > c |
60 hg add c |
61 hg add c |
61 hg commit -m "commit #3" -d "0 0" |
62 hg commit -m "commit #3" -d "0 0" |
|
63 |
|
64 echo 'Contents of b should be "this is file b1"' |
62 cat b |
65 cat b |
|
66 |
63 echo This is file b22 > b |
67 echo This is file b22 > b |
|
68 echo %% merge expected! |
64 env HGMERGE=../merge hg update -m 2 |
69 env HGMERGE=../merge hg update -m 2 |
65 # merge expected! |
|
66 cd ..; /bin/rm -rf t |
70 cd ..; /bin/rm -rf t |
67 |
71 |
68 mkdir t |
72 mkdir t |
69 cd t |
73 cd t |
70 hg init |
74 hg init |
79 hg update 1 |
83 hg update 1 |
80 echo This is file c1 > c |
84 echo This is file c1 > c |
81 hg add c |
85 hg add c |
82 hg commit -m "commit #3" -d "0 0" |
86 hg commit -m "commit #3" -d "0 0" |
83 echo This is file b33 > b |
87 echo This is file b33 > b |
|
88 echo %% merge of b expected |
84 env HGMERGE=../merge hg update -m 2 |
89 env HGMERGE=../merge hg update -m 2 |
85 # merge of b expected |
|
86 cd ..; /bin/rm -rf t |
90 cd ..; /bin/rm -rf t |