Show More
@@ -4546,6 +4546,10 b' def resolve(ui, repo, *pats, **opts):' | |||
|
4546 | 4546 | if not (all or pats or show or mark or unmark): |
|
4547 | 4547 | raise error.Abort(_('no files or directories specified'), |
|
4548 | 4548 | hint=('use --all to re-merge all unresolved files')) |
|
4549 | if mark and confirm and not pats: | |
|
4550 | if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?' | |
|
4551 | b'$$ &Yes $$ &No')): | |
|
4552 | raise error.Abort(_('user quit')) | |
|
4549 | 4553 | |
|
4550 | 4554 | if show: |
|
4551 | 4555 | ui.pager('resolve') |
@@ -509,6 +509,33 b' Test when config option is set:' | |||
|
509 | 509 | warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') |
|
510 | 510 | [1] |
|
511 | 511 | |
|
512 | Test that commands.resolve.confirm respect --mark option (only when no patterns args are given): | |
|
513 | =============================================================================================== | |
|
514 | ||
|
515 | $ hg resolve -m emp1 | |
|
516 | $ hg resolve -l | |
|
517 | R emp1 | |
|
518 | U emp2 | |
|
519 | U emp3 | |
|
520 | ||
|
521 | $ hg resolve -m << EOF | |
|
522 | > n | |
|
523 | > EOF | |
|
524 | mark all unresolved files as resolved (yn)? n | |
|
525 | abort: user quit | |
|
526 | [255] | |
|
527 | ||
|
528 | $ hg resolve -m << EOF | |
|
529 | > y | |
|
530 | > EOF | |
|
531 | mark all unresolved files as resolved (yn)? y | |
|
532 | (no more unresolved files) | |
|
533 | continue: hg rebase --continue | |
|
534 | $ hg resolve -l | |
|
535 | R emp1 | |
|
536 | R emp2 | |
|
537 | R emp3 | |
|
538 | ||
|
512 | 539 | $ hg rebase --abort |
|
513 | 540 | rebase aborted |
|
514 | 541 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now