Show More
@@ -4546,10 +4546,15 b' def resolve(ui, repo, *pats, **opts):' | |||||
4546 | if not (all or pats or show or mark or unmark): |
|
4546 | if not (all or pats or show or mark or unmark): | |
4547 | raise error.Abort(_('no files or directories specified'), |
|
4547 | raise error.Abort(_('no files or directories specified'), | |
4548 | hint=('use --all to re-merge all unresolved files')) |
|
4548 | hint=('use --all to re-merge all unresolved files')) | |
|
4549 | ||||
4549 | if mark and confirm and not pats: |
|
4550 | if mark and confirm and not pats: | |
4550 | if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?' |
|
4551 | if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?' | |
4551 | b'$$ &Yes $$ &No')): |
|
4552 | b'$$ &Yes $$ &No')): | |
4552 | raise error.Abort(_('user quit')) |
|
4553 | raise error.Abort(_('user quit')) | |
|
4554 | if unmark and confirm and not pats: | |||
|
4555 | if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?' | |||
|
4556 | b'$$ &Yes $$ &No')): | |||
|
4557 | raise error.Abort(_('user quit')) | |||
4553 |
|
4558 | |||
4554 | if show: |
|
4559 | if show: | |
4555 | ui.pager('resolve') |
|
4560 | ui.pager('resolve') |
@@ -557,6 +557,35 b' Test that commands.resolve.confirm respe' | |||||
557 | R emp2 |
|
557 | R emp2 | |
558 | R emp3 |
|
558 | R emp3 | |
559 |
|
559 | |||
|
560 | Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given): | |||
|
561 | =============================================================================================== | |||
|
562 | ||||
|
563 | $ hg resolve -u emp1 | |||
|
564 | ||||
|
565 | $ hg resolve -l | |||
|
566 | U emp1 | |||
|
567 | R emp2 | |||
|
568 | R emp3 | |||
|
569 | ||||
|
570 | $ hg resolve -u << EOF | |||
|
571 | > n | |||
|
572 | > EOF | |||
|
573 | mark all resolved files as unresolved (yn)? n | |||
|
574 | abort: user quit | |||
|
575 | [255] | |||
|
576 | ||||
|
577 | $ hg resolve -m << EOF | |||
|
578 | > y | |||
|
579 | > EOF | |||
|
580 | mark all unresolved files as resolved (yn)? y | |||
|
581 | (no more unresolved files) | |||
|
582 | continue: hg rebase --continue | |||
|
583 | ||||
|
584 | $ hg resolve -l | |||
|
585 | R emp1 | |||
|
586 | R emp2 | |||
|
587 | R emp3 | |||
|
588 | ||||
560 | $ hg rebase --abort |
|
589 | $ hg rebase --abort | |
561 | rebase aborted |
|
590 | rebase aborted | |
562 | $ cd .. |
|
591 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now