Mercurial > evolve
diff tests/test-stabilize-result.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 | f6517779a7c4 |
children | 06844693bb21 |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Thu Aug 24 10:48:38 2017 -0700 +++ b/tests/test-stabilize-result.t Thu Aug 24 10:57:32 2017 -0700 @@ -141,7 +141,7 @@ Make precursors public $ hg phase --hidden --public 8 - 1 new phasedivergent changesets + 1 new phase-divergent changesets $ glog @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) | @@ -228,7 +228,7 @@ $ cat a.old >> a $ rm a.old $ hg amend - 2 new contentdivergent changesets + 2 new content-divergent changesets $ glog @ 19:eacc9c8240fe@default(draft) bk:[] More addition | @@ -338,7 +338,7 @@ (use 'hg evolve' to update to its successor: f344982e63c4) $ echo 'gotta break' >> a $ hg amend - 2 new contentdivergent changesets + 2 new content-divergent changesets # reamend so that the case is not the first precursor. $ hg amend -m "More addition (2)" $ hg phase 'contentdivergent()'