Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/templates/map-cmdline.phases
author Laurent Charignon <lcharignon@fb.com>
Mon, 14 Sep 2015 17:31:48 -0700
changeset 26349 92409f8dff5d
parent 24907 9570587b6986
child 34714 f4aeb952ab77
permissions -rw-r--r--
rebase: don't rebase obsolete commit whose successor is already rebased This patch avoids unnecessary conflicts to resolve during rebase for the users of changeset evolution. This patch modifies rebase to skip obsolete commits if they are being rebased on their successors. It introduces a new rebase state 'revprecursor' for these revisions that are being skipped and a new message to inform the user of what is happening. This feature is gated behind the config flag experimental.rebaseskipobsolete When an obsolete commit is skipped, the output is: not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K"
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
24907
9570587b6986 template-phases: extend default style instead of duplicating it
Yuya Nishihara <yuya@tcha.org>
parents: 24853
diff changeset 
     1
 
%include map-cmdline.default
22767
9579034d9eb2 log: add labels to the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 19126
diff changeset 
     2
 
changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{summary}\n'
22768
66bf251ee672 log: show phase in hg log -v with the phase template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22767
diff changeset 
     3
 
changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
hg-stable