209 |
209 |
210 .orig files should exists where specified |
210 .orig files should exists where specified |
211 $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups' |
211 $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups' |
212 merging file1 |
212 merging file1 |
213 creating directory: $TESTTMP/repo/.hg/origbackups |
213 creating directory: $TESTTMP/repo/.hg/origbackups |
|
214 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
214 merging file2 |
215 merging file2 |
215 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
|
216 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
216 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
217 [1] |
217 [1] |
218 $ ls .hg/origbackups |
218 $ ls .hg/origbackups |
219 file1 |
219 file1 |
220 file2 |
220 file2 |
476 o 0 88660038d466 add boss |
476 o 0 88660038d466 add boss |
477 |
477 |
478 $ hg rebase -s 1 -d 2 |
478 $ hg rebase -s 1 -d 2 |
479 rebasing 1:f30f98a8181f "added emp1 emp2 emp3" |
479 rebasing 1:f30f98a8181f "added emp1 emp2 emp3" |
480 merging emp1 |
480 merging emp1 |
|
481 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') |
481 merging emp2 |
482 merging emp2 |
|
483 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') |
482 merging emp3 |
484 merging emp3 |
483 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') |
|
484 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') |
|
485 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') |
485 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') |
486 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
486 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
487 [240] |
487 [240] |
488 |
488 |
489 Test when commands.resolve.confirm config option is not set: |
489 Test when commands.resolve.confirm config option is not set: |
490 =========================================================== |
490 =========================================================== |
491 $ hg resolve --all |
491 $ hg resolve --all |
492 merging emp1 |
492 merging emp1 |
|
493 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') |
493 merging emp2 |
494 merging emp2 |
|
495 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') |
494 merging emp3 |
496 merging emp3 |
495 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') |
|
496 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') |
|
497 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') |
497 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') |
498 [1] |
498 [1] |
499 |
499 |
500 Test when config option is set: |
500 Test when config option is set: |
501 ============================== |
501 ============================== |
520 $ hg resolve --all << EOF |
520 $ hg resolve --all << EOF |
521 > y |
521 > y |
522 > EOF |
522 > EOF |
523 re-merge all unresolved files (yn)? y |
523 re-merge all unresolved files (yn)? y |
524 merging emp1 |
524 merging emp1 |
|
525 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') |
525 merging emp2 |
526 merging emp2 |
|
527 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') |
526 merging emp3 |
528 merging emp3 |
527 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') |
|
528 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') |
|
529 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') |
529 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') |
530 [1] |
530 [1] |
531 |
531 |
532 Test that commands.resolve.confirm respect --mark option (only when no patterns args are given): |
532 Test that commands.resolve.confirm respect --mark option (only when no patterns args are given): |
533 =============================================================================================== |
533 =============================================================================================== |