Mercurial > evolve
comparison tests/test-obsolete.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 |
|---|---|
| 519 | 519 |
| 520 #excluded 'whole rebase set is extinct and ignored.' message not in core | 520 #excluded 'whole rebase set is extinct and ignored.' message not in core |
| 521 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 | 521 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 |
| 522 rebasing 3:0d3f46688ccc "add obsol_c" | 522 rebasing 3:0d3f46688ccc "add obsol_c" |
| 523 rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip) | 523 rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip) |
| 524 2 new divergent changesets | 524 2 new contentdivergent changesets |
| 525 $ hg --hidden log -q -r 'successors(3)' | 525 $ hg --hidden log -q -r 'successors(3)' |
| 526 4:725c380fe99b | 526 4:725c380fe99b |
| 527 10:2033b4e49474 | 527 10:2033b4e49474 |
| 528 $ hg up tip | 528 $ hg up tip |
| 529 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) | 529 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |