Mercurial > evolve
comparison tests/test-evolve-list.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 | 1db0137297f4 |
| children | 4b934144ed11 |
comparison
equal
deleted
inserted
replaced
| 2855:1db0137297f4 | 2856:f6517779a7c4 |
|---|---|
| 62 created new head | 62 created new head |
| 63 $ hg rebase -s 1 -d 2 | 63 $ hg rebase -s 1 -d 2 |
| 64 rebasing 1:d2ae7f538514 "b" | 64 rebasing 1:d2ae7f538514 "b" |
| 65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True | 65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True |
| 66 rebasing 1:d2ae7f538514 "b" | 66 rebasing 1:d2ae7f538514 "b" |
| 67 2 new divergent changesets | 67 2 new contentdivergent changesets |
| 68 $ hg evolve --list | 68 $ hg evolve --list |
| 69 c882616e9d84: b | 69 c882616e9d84: b |
| 70 divergent: a922b3733e98 (draft) (precursor d2ae7f538514) | 70 divergent: a922b3733e98 (draft) (precursor d2ae7f538514) |
| 71 | 71 |
| 72 a922b3733e98: b | 72 a922b3733e98: b |