Mercurial > evolve
comparison tests/test-inhibit.t @ 2855:1db0137297f4
warning: rename bumped warning message
bumped has been renamed into phasedivergent. Update the warning message when
new phasedivergent changesets are detected.
Renaming done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 24 Aug 2017 09:11:54 +0200 |
parents | a1805a65ce21 |
children | 4b934144ed11 |
comparison
equal
deleted
inserted
replaced
2854:66796d7b5415 | 2855:1db0137297f4 |
---|---|
157 o 4:98065434e5c6 add cE | 157 o 4:98065434e5c6 add cE |
158 | | 158 | |
159 o 0:54ccbc537fc2 add cA | 159 o 0:54ccbc537fc2 add cA |
160 | 160 |
161 $ hg phase --public 7 | 161 $ hg phase --public 7 |
162 1 new bumped changesets | 162 1 new phasedivergent changesets |
163 $ hg strip 9 | 163 $ hg strip 9 |
164 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 164 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
165 working directory now at cf5c4f4554ce | 165 working directory now at cf5c4f4554ce |
166 1 changesets pruned | 166 1 changesets pruned |
167 $ hg log -G | 167 $ hg log -G |