Mercurial > evolve
comparison tests/test-evolve.t @ 2858:4b934144ed11
messages: use hyphenated '{phase,content}-divergent' in user messages
The hyphenated version is more readable and it's what we use the
{instabilities} template.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 24 Aug 2017 10:57:32 -0700 |
parents | 1db0137297f4 |
children | 06844693bb21 |
comparison
equal
deleted
inserted
replaced
2857:0c286d054bcd | 2858:4b934144ed11 |
---|---|
397 0 : base - test | 397 0 : base - test |
398 | 398 |
399 phase change turning obsolete changeset public issue a bumped warning | 399 phase change turning obsolete changeset public issue a bumped warning |
400 | 400 |
401 $ hg phase --hidden --public 7 | 401 $ hg phase --hidden --public 7 |
402 1 new phasedivergent changesets | 402 1 new phase-divergent changesets |
403 | 403 |
404 all solving bumped troubled | 404 all solving bumped troubled |
405 | 405 |
406 $ hg log -G | 406 $ hg log -G |
407 @ 8 feature-B: another feature that rox - test | 407 @ 8 feature-B: another feature that rox - test |
1012 | 1012 |
1013 $ echo "hello world" > newfile | 1013 $ echo "hello world" > newfile |
1014 $ hg add newfile | 1014 $ hg add newfile |
1015 $ hg commit -m "add new file bumped" -o 11 | 1015 $ hg commit -m "add new file bumped" -o 11 |
1016 $ hg phase --public --hidden 11 | 1016 $ hg phase --public --hidden 11 |
1017 1 new phasedivergent changesets | 1017 1 new phase-divergent changesets |
1018 $ hg log -G | 1018 $ hg log -G |
1019 @ 12 : add new file bumped - test | 1019 @ 12 : add new file bumped - test |
1020 | | 1020 | |
1021 | o 11 : a2 - test | 1021 | o 11 : a2 - test |
1022 |/ | 1022 |/ |