116 $ hg up -q 'desc("A0")' |
116 $ hg up -q 'desc("A0")' |
117 $ HGEDITOR="echo C1 >" hg graft -r 'desc("C0")' --edit |
117 $ HGEDITOR="echo C1 >" hg graft -r 'desc("C0")' --edit |
118 grafting 2:f58c7e2b28fa "C0" |
118 grafting 2:f58c7e2b28fa "C0" |
119 merging f1a and f1b to f1a |
119 merging f1a and f1b to f1a |
120 merging f5a |
120 merging f5a |
121 warning: can't find ancestor for 'f5a' copied from 'f5b'! |
|
122 $ hg status --change . |
121 $ hg status --change . |
123 M f1a |
122 M f1a |
124 M f5a |
123 M f5a |
125 A f2c |
124 A f2c |
126 R f2a |
125 R f2a |
135 $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit |
134 $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit |
136 grafting 3:b69f5839d2d9 "D0" |
135 grafting 3:b69f5839d2d9 "D0" |
137 note: possible conflict - f3b was renamed multiple times to: |
136 note: possible conflict - f3b was renamed multiple times to: |
138 f3a |
137 f3a |
139 f3d |
138 f3d |
140 warning: can't find ancestor for 'f3d' copied from 'f3b'! |
|
141 |
139 |
142 Set up the repository for some further tests |
140 Set up the repository for some further tests |
143 |
141 |
144 $ hg up -q "min(desc("A0"))" |
142 $ hg up -q "min(desc("A0"))" |
145 $ hg mv f1a f1e |
143 $ hg mv f1a f1e |
222 grafting 3:b69f5839d2d9 "D0" |
220 grafting 3:b69f5839d2d9 "D0" |
223 note: possible conflict - f3b was renamed multiple times to: |
221 note: possible conflict - f3b was renamed multiple times to: |
224 f3d |
222 f3d |
225 f3e |
223 f3e |
226 merging f4e and f4a to f4e |
224 merging f4e and f4a to f4e |
227 warning: can't find ancestor for 'f3d' copied from 'f3b'! |
|
228 |
225 |
229 $ hg cat f2c |
226 $ hg cat f2c |
230 c2e |
227 c2e |
231 |
228 |
232 Test the case A.5 (move case, f1x). |
229 Test the case A.5 (move case, f1x). |
233 |
230 |
234 $ hg up -q "desc("C0")" |
231 $ hg up -q "desc("C0")" |
235 BROKEN: Shouldn't get the warning about missing ancestor |
|
236 $ HGEDITOR="echo E1 >" hg graft -r 'desc("E0")' --edit |
232 $ HGEDITOR="echo E1 >" hg graft -r 'desc("E0")' --edit |
237 grafting 6:6bd1736cab86 "E0" |
233 grafting 6:6bd1736cab86 "E0" |
238 note: possible conflict - f1a was renamed multiple times to: |
234 note: possible conflict - f1a was renamed multiple times to: |
239 f1b |
235 f1b |
240 f1e |
236 f1e |
241 note: possible conflict - f3a was renamed multiple times to: |
237 note: possible conflict - f3a was renamed multiple times to: |
242 f3b |
238 f3b |
243 f3e |
239 f3e |
244 merging f2c and f2a to f2c |
240 merging f2c and f2a to f2c |
245 merging f5a and f5b to f5b |
241 merging f5a and f5b to f5b |
246 warning: can't find ancestor for 'f1e' copied from 'f1a'! |
|
247 warning: can't find ancestor for 'f3e' copied from 'f3a'! |
|
248 $ cat f1e |
242 $ cat f1e |
249 c1a |
243 c1a |
250 |
244 |
251 Test the case A.5 (copy case, f1x). |
245 Test the case A.5 (copy case, f1x). |
252 |
246 |
253 $ hg up -q "desc("C0")" |
247 $ hg up -q "desc("C0")" |
254 BROKEN: Shouldn't get the warning about missing ancestor |
|
255 $ HGEDITOR="echo F1 >" hg graft -r 'desc("F0")' --edit |
248 $ HGEDITOR="echo F1 >" hg graft -r 'desc("F0")' --edit |
256 grafting 7:d376ab0d7fda "F0" |
249 grafting 7:d376ab0d7fda "F0" |
257 warning: can't find ancestor for 'f1f' copied from 'f1a'! |
|
258 BROKEN: f1f should be marked a copy from f1b |
250 BROKEN: f1f should be marked a copy from f1b |
259 $ hg st --copies --change . |
251 $ hg st --copies --change . |
260 A f1f |
252 A f1f |
261 BROKEN: f1f should have the new content from f1b (i.e. "c1c") |
253 BROKEN: f1f should have the new content from f1b (i.e. "c1c") |
262 $ cat f1f |
254 $ cat f1f |
268 BROKEN: We should get a merge conflict from the 3-way merge between f1b in C0 |
260 BROKEN: We should get a merge conflict from the 3-way merge between f1b in C0 |
269 (content "c1c") and f1g in G0 (content "c1g") with f1a in A0 as base (content |
261 (content "c1c") and f1g in G0 (content "c1g") with f1a in A0 as base (content |
270 "c1a") |
262 "c1a") |
271 $ HGEDITOR="echo G1 >" hg graft -r 'desc("G0")' --edit |
263 $ HGEDITOR="echo G1 >" hg graft -r 'desc("G0")' --edit |
272 grafting 8:ba67f08fb15a "G0" |
264 grafting 8:ba67f08fb15a "G0" |
273 warning: can't find ancestor for 'f1g' copied from 'f1a'! |
|
274 |
265 |
275 Check the results of the grafts tested |
266 Check the results of the grafts tested |
276 |
267 |
277 $ hg log -CGv --patch --git |
268 $ hg log -CGv --patch --git |
278 @ changeset: 13:ef3adf6c20a4 |
269 @ changeset: 13:ef3adf6c20a4 |