Mercurial > evolve
comparison tests/test-evolve-order.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 |
comparison
equal
deleted
inserted
replaced
| 2855:1db0137297f4 | 2856:f6517779a7c4 |
|---|---|
| 250 $ hg prune -s 'desc(c3part1)' 'desc(c3_)' | 250 $ hg prune -s 'desc(c3part1)' 'desc(c3_)' |
| 251 1 changesets pruned | 251 1 changesets pruned |
| 252 1 new orphan changesets | 252 1 new orphan changesets |
| 253 $ hg prune -s 'desc(c3part2)' 'desc(c3_)' | 253 $ hg prune -s 'desc(c3part2)' 'desc(c3_)' |
| 254 1 changesets pruned | 254 1 changesets pruned |
| 255 2 new divergent changesets | 255 2 new contentdivergent changesets |
| 256 $ hg up 'desc(b3prime)' | 256 $ hg up 'desc(b3prime)' |
| 257 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | 257 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 258 $ hg amend -m 'b3second' | 258 $ hg amend -m 'b3second' |
| 259 1 new orphan changesets | 259 1 new orphan changesets |
| 260 $ hg evolve --rev "orphan()" | 260 $ hg evolve --rev "orphan()" |