107 file 'x' was deleted in local [local] but was modified in other [graft]. |
107 file 'x' was deleted in local [local] but was modified in other [graft]. |
108 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
108 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
109 What do you want to do? u |
109 What do you want to do? u |
110 abort: unresolved conflicts, can't continue |
110 abort: unresolved conflicts, can't continue |
111 (use 'hg resolve' and 'hg graft --continue') |
111 (use 'hg resolve' and 'hg graft --continue') |
112 [255] |
112 [1] |
113 |
113 |
114 Add x, remove it, then add it back, then rename x to y. Similar to the case |
114 Add x, remove it, then add it back, then rename x to y. Similar to the case |
115 above, but here the break in history is before the rename. |
115 above, but here the break in history is before the rename. |
116 $ newrepo |
116 $ newrepo |
117 $ echo x > x |
117 $ echo x > x |
191 file 'x' was deleted in local [local] but was modified in other [graft]. |
191 file 'x' was deleted in local [local] but was modified in other [graft]. |
192 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
192 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
193 What do you want to do? u |
193 What do you want to do? u |
194 abort: unresolved conflicts, can't continue |
194 abort: unresolved conflicts, can't continue |
195 (use 'hg resolve' and 'hg graft --continue') |
195 (use 'hg resolve' and 'hg graft --continue') |
196 [255] |
196 [1] |
197 #endif |
197 #endif |
198 $ hg co -qC 2 |
198 $ hg co -qC 2 |
199 BROKEN: This should succeed and merge the changes from x into y |
199 BROKEN: This should succeed and merge the changes from x into y |
200 $ hg graft -r 5 |
200 $ hg graft -r 5 |
201 grafting 5:* "rename x to y"* (glob) |
201 grafting 5:* "rename x to y"* (glob) |
202 file 'x' was deleted in other [graft] but was modified in local [local]. |
202 file 'x' was deleted in other [graft] but was modified in local [local]. |
203 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
203 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
204 What do you want to do? u |
204 What do you want to do? u |
205 abort: unresolved conflicts, can't continue |
205 abort: unresolved conflicts, can't continue |
206 (use 'hg resolve' and 'hg graft --continue') |
206 (use 'hg resolve' and 'hg graft --continue') |
207 [255] |
207 [1] |
208 |
208 |
209 Add x, remove it, then add it back, rename x to y from the first commit. |
209 Add x, remove it, then add it back, rename x to y from the first commit. |
210 Similar to the case above, but here the break in history is parallel to the |
210 Similar to the case above, but here the break in history is parallel to the |
211 rename. |
211 rename. |
212 $ newrepo |
212 $ newrepo |
276 file 'x' was deleted in other [graft] but was modified in local [local]. |
276 file 'x' was deleted in other [graft] but was modified in local [local]. |
277 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
277 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
278 What do you want to do? u |
278 What do you want to do? u |
279 abort: unresolved conflicts, can't continue |
279 abort: unresolved conflicts, can't continue |
280 (use 'hg resolve' and 'hg graft --continue') |
280 (use 'hg resolve' and 'hg graft --continue') |
281 [255] |
281 [1] |
282 |
282 |
283 Add x on two branches, then rename x to y on one side. Similar to the case |
283 Add x on two branches, then rename x to y on one side. Similar to the case |
284 above, but here the break in history is via the base commit. |
284 above, but here the break in history is via the base commit. |
285 $ newrepo |
285 $ newrepo |
286 $ echo a > a |
286 $ echo a > a |
359 file 'x' was deleted in local [local] but was modified in other [graft]. |
359 file 'x' was deleted in local [local] but was modified in other [graft]. |
360 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
360 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
361 What do you want to do? u |
361 What do you want to do? u |
362 abort: unresolved conflicts, can't continue |
362 abort: unresolved conflicts, can't continue |
363 (use 'hg resolve' and 'hg graft --continue') |
363 (use 'hg resolve' and 'hg graft --continue') |
364 [255] |
364 [1] |
365 #endif |
365 #endif |
366 $ hg co -qC 2 |
366 $ hg co -qC 2 |
367 BROKEN: This should succeed and merge the changes from x into y |
367 BROKEN: This should succeed and merge the changes from x into y |
368 $ hg graft -r 5 |
368 $ hg graft -r 5 |
369 grafting 5:* "rename x to y"* (glob) |
369 grafting 5:* "rename x to y"* (glob) |
370 file 'x' was deleted in other [graft] but was modified in local [local]. |
370 file 'x' was deleted in other [graft] but was modified in local [local]. |
371 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
371 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
372 What do you want to do? u |
372 What do you want to do? u |
373 abort: unresolved conflicts, can't continue |
373 abort: unresolved conflicts, can't continue |
374 (use 'hg resolve' and 'hg graft --continue') |
374 (use 'hg resolve' and 'hg graft --continue') |
375 [255] |
375 [1] |
376 |
376 |
377 Copies via null revision (there shouldn't be any) |
377 Copies via null revision (there shouldn't be any) |
378 $ newrepo |
378 $ newrepo |
379 $ echo x > x |
379 $ echo x > x |
380 $ hg ci -Aqm 'add x' |
380 $ hg ci -Aqm 'add x' |