Mercurial > evolve

comparison tests/test-evolve-bumped.t @ 2858:4b934144ed11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bd7e8be29542
comparison
equal deleted inserted replaced
2857:0c286d054bcd 2858:4b934144ed11
65 $ hg amend -m 'tweak a' 65 $ hg amend -m 'tweak a'
66 $ hg pull ../public 66 $ hg pull ../public
67 pulling from ../public 67 pulling from ../public
68 searching for changes 68 searching for changes
69 no changes found 69 no changes found
70 1 new phasedivergent changesets 70 1 new phase-divergent changesets
71 71
72 $ hg evolve -a -A --phasedivergent 72 $ hg evolve -a -A --phasedivergent
73 recreate:[2] tweak a 73 recreate:[2] tweak a
74 atop:[1] modify a 74 atop:[1] modify a
75 computing new diff 75 computing new diff
103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
104 (branch merge, don't forget to commit) 104 (branch merge, don't forget to commit)
105 $ hg commit -m "merge" 105 $ hg commit -m "merge"
106 $ hg commit --amend -m "New message" 106 $ hg commit --amend -m "New message"
107 $ hg phase --public 551127da2a8a --hidden 107 $ hg phase --public 551127da2a8a --hidden
108 1 new phasedivergent changesets 108 1 new phase-divergent changesets
109 $ hg log -G 109 $ hg log -G
110 @ 7:b28e84916d8c@default(draft) New message 110 @ 7:b28e84916d8c@default(draft) New message
111 |\ 111 |\
112 +---o 6:551127da2a8a@default(public) merge 112 +---o 6:551127da2a8a@default(public) merge
113 | |/ 113 | |/