Mercurial > hg
comparison tests/test-dirstate-race.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 | 28a4fb793ba1 |
| children | 93eb6c8035a9 |
comparison
equal
deleted
inserted
replaced
| 45770:96fcc37a9c80 | 45771:f90a5c211251 |
|---|---|
| 223 > test.executable=sh | 223 > test.executable=sh |
| 224 > test.args=$TESTTMP/mergetool-race.sh \$output | 224 > test.args=$TESTTMP/mergetool-race.sh \$output |
| 225 > EOF | 225 > EOF |
| 226 | 226 |
| 227 $ hg rebase -s . -d 3 --tool test | 227 $ hg rebase -s . -d 3 --tool test |
| 228 rebasing 4:b08445fd6b2a "c4" (tip) | 228 rebasing 4:b08445fd6b2a tip "c4" |
| 229 merging a | 229 merging a |
| 230 custom merge tool | 230 custom merge tool |
| 231 custom merge tool end | 231 custom merge tool end |
| 232 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/* (glob) | 232 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/* (glob) |
| 233 | 233 |