Mercurial > hg
comparison tests/test-fix.t @ 45771:f90a5c211251
rebase: change and standarize template for rebase's one-line summary
This removes the default template in rebase and switches to a
centrally defined template. I've simplified it a bit to avoid the
conditional parenthesis. I've also added labels so the different parts
can be easily colored. The template is somewhat similar to what we've
used internally at Google for a few years.
I'm happy to change the template if others have opinions. Should we
reuse the `color.log.` names as I have?
Differential Revision: https://phab.mercurial-scm.org/D9252
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 27 Oct 2020 15:33:15 -0700 |
parents | 3ea3b85df03f |
children | f90943d753ef |
comparison
equal
deleted
inserted
replaced
45770:96fcc37a9c80 | 45771:f90a5c211251 |
---|---|
863 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 863 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
864 $ echo "foo2" > foo.whole | 864 $ echo "foo2" > foo.whole |
865 $ hg commit -Aqm "foo 2" | 865 $ hg commit -Aqm "foo 2" |
866 | 866 |
867 $ hg --config extensions.rebase= rebase -r 1 -d 0 | 867 $ hg --config extensions.rebase= rebase -r 1 -d 0 |
868 rebasing 1:c3b6dc0e177a "foo 2" (tip) | 868 rebasing 1:c3b6dc0e177a tip "foo 2" |
869 merging foo.whole | 869 merging foo.whole |
870 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') | 870 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') |
871 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 871 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
872 [1] | 872 [1] |
873 | 873 |