Mercurial > evolve
diff tests/test-uncommit.t @ 2856:f6517779a7c4
warning: rename warning message
divergent has been renamed into contentdivergent. Use their renamed
counterpart in warning message for new unstable changesets.
Renaming done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 24 Aug 2017 09:12:09 +0200 |
| parents | 66796d7b5415 |
| children | 4b934144ed11 |
line wrap: on
line diff
--- a/tests/test-uncommit.t Thu Aug 24 09:11:54 2017 +0200 +++ b/tests/test-uncommit.t Thu Aug 24 09:12:09 2017 +0200 @@ -244,7 +244,7 @@ (use 'hg evolve' to update to its successor: e8db4aa611f6) $ hg --config extensions.purge= purge $ hg uncommit -I 'set:added() and e' - 2 new divergent changesets + 2 new contentdivergent changesets $ hg st --copies A e $ hg st --copies --change . @@ -290,7 +290,7 @@ (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) $ hg --config extensions.purge= purge $ hg uncommit --all -X e - 1 new divergent changesets + 1 new contentdivergent changesets $ hg st --copies M b M d