Mercurial > evolve
comparison tests/test-evolve-templates.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 | 20c2499ce8bc |
| children | 4b934144ed11 |
comparison
equal
deleted
inserted
replaced
| 2855:1db0137297f4 | 2856:f6517779a7c4 |
|---|---|
| 616 $ hg update --hidden 'desc(A0)' | 616 $ hg update --hidden 'desc(A0)' |
| 617 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 617 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 618 working directory parent is obsolete! (471f378eab4c) | 618 working directory parent is obsolete! (471f378eab4c) |
| 619 (use 'hg evolve' to update to its successor: fdf9bde5129a) | 619 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
| 620 $ hg amend -m "A2" | 620 $ hg amend -m "A2" |
| 621 2 new divergent changesets | 621 2 new contentdivergent changesets |
| 622 $ hg log --hidden -G | 622 $ hg log --hidden -G |
| 623 @ changeset: 3:65b757b745b9 | 623 @ changeset: 3:65b757b745b9 |
| 624 | tag: tip | 624 | tag: tip |
| 625 | parent: 0:ea207398892e | 625 | parent: 0:ea207398892e |
| 626 | user: test | 626 | user: test |