equal
deleted
inserted
replaced
21 hg add c |
21 hg add c |
22 hg commit -m "commit #2" -d "1000000 0" |
22 hg commit -m "commit #2" -d "1000000 0" |
23 echo This is file b1 > b |
23 echo This is file b1 > b |
24 echo %% no merges expected |
24 echo %% no merges expected |
25 env HGMERGE=../merge hg merge 1 |
25 env HGMERGE=../merge hg merge 1 |
|
26 hg diff --nodates |
|
27 hg status |
26 cd ..; /bin/rm -rf t |
28 cd ..; /bin/rm -rf t |
27 |
29 |
28 mkdir t |
30 mkdir t |
29 cd t |
31 cd t |
30 hg init |
32 hg init |
42 echo This is file b2 > b |
44 echo This is file b2 > b |
43 echo %% merge should fail |
45 echo %% merge should fail |
44 env HGMERGE=../merge hg merge 1 |
46 env HGMERGE=../merge hg merge 1 |
45 echo %% merge of b expected |
47 echo %% merge of b expected |
46 env HGMERGE=../merge hg merge -f 1 |
48 env HGMERGE=../merge hg merge -f 1 |
|
49 hg diff --nodates |
|
50 hg status |
47 cd ..; /bin/rm -rf t |
51 cd ..; /bin/rm -rf t |
48 echo %% |
52 echo %% |
49 |
53 |
50 mkdir t |
54 mkdir t |
51 cd t |
55 cd t |
69 echo This is file b22 > b |
73 echo This is file b22 > b |
70 echo %% merge fails |
74 echo %% merge fails |
71 env HGMERGE=../merge hg merge 2 |
75 env HGMERGE=../merge hg merge 2 |
72 echo %% merge expected! |
76 echo %% merge expected! |
73 env HGMERGE=../merge hg merge -f 2 |
77 env HGMERGE=../merge hg merge -f 2 |
|
78 hg diff --nodates |
|
79 hg status |
74 cd ..; /bin/rm -rf t |
80 cd ..; /bin/rm -rf t |
75 |
81 |
76 mkdir t |
82 mkdir t |
77 cd t |
83 cd t |
78 hg init |
84 hg init |
91 echo This is file b33 > b |
97 echo This is file b33 > b |
92 echo %% merge of b should fail |
98 echo %% merge of b should fail |
93 env HGMERGE=../merge hg merge 2 |
99 env HGMERGE=../merge hg merge 2 |
94 echo %% merge of b expected |
100 echo %% merge of b expected |
95 env HGMERGE=../merge hg merge -f 2 |
101 env HGMERGE=../merge hg merge -f 2 |
|
102 hg diff --nodates |
|
103 hg status |
96 cd ..; /bin/rm -rf t |
104 cd ..; /bin/rm -rf t |