Mercurial > hg
view tests/test-rebase-keep-branch.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.
author | David Champion <dgc@uchicago.edu> |
---|---|
date | Mon, 10 May 2010 11:04:56 -0500 |
parents | 609ce91670d0 |
children | 5b48d819d5f9 |
line wrap: on
line source
0 files updated, 0 files merged, 2 files removed, 0 files unresolved marked working directory as branch notdefault created new head @ 4:r1:notdefault | | o 3:l2: | | | o 2:l1: |/ o 1:c2: | o 0:c1: % Rebase a branch while preserving the branch name 2 files updated, 0 files merged, 1 files removed, 0 files unresolved saving bundle to adding branch adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files rebase completed @ 4:r1:notdefault | o 3:l2: | o 2:l1: | o 1:c2: | o 0:c1: % dirstate branch should be "notdefault" notdefault