view tests/test-bookmarks-strip.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.

% add file
adding qqq.txt
% commit first revision
% set bookmark
% commit second revision
% set bookmark
% update to -2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% commit new head
created new head
% bookmarks updated?
   test                      1:16b24da7e457
   test2                     1:16b24da7e457
% strip to revision 1
saving bundle to 
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
% list bookmarks
 * test                      1:9f1b7e78eff8
 * test2                     1:9f1b7e78eff8