view tests/test-rebase-check-restore.out @ 11148:a912f26777d3

merge: introduce tool.check parameter

tool.check is a list of check options, and can be used in place of
tool.checkchanged and tool.checkconflicts:

Equivalences:
tool.checkchanged = yes
tool.checkconflicts = no
tool.check = changed

tool.checkchanged = no
tool.checkconflicts = yes
tool.check = conflicts

tool.checkchanged = yes
tool.checkconflicts = yes
tool.check = changed, conflicts

Add _toollist() wrapper for ui.configlist() to implement this consistently.

checkchanged and checkconflicts are still supported, but check is
preferred for implementing new check options.

% - Rebasing B onto E - check keep
@  5:F:notdefault
|
| o  4:E:
| |
| o  3:D:
|/
| o  2:C:
| |
| o  1:B:
|/
o  0:A:

merging A
warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue

% - Solve the conflict and go on
rebase completed
@  7:C:
|
o  6:B:
|
| o  5:F:notdefault
| |
o |  4:E:
| |
o |  3:D:
|/
| o  2:C:
| |
| o  1:B:
|/
o  0:A:


% - Rebase F onto E - check keepbranches
@  5:F:notdefault
|
| o  4:E:
| |
| o  3:D:
|/
| o  2:C:
| |
| o  1:B:
|/
o  0:A:

merging A
warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue

% - Solve the conflict and go on
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
rebase completed
@  5:F:notdefault
|
o  4:E:
|
o  3:D:
|
| o  2:C:
| |
| o  1:B:
|/
o  0:A: