Mercurial > evolve
comparison tests/test-obsolete.t @ 3154:406992d0d611
evolve: rename --contentdivergent flag to --content-divergent
This makes the whole things easier to read.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 26 Oct 2017 09:02:25 +0200 |
parents | 663dbef40f97 |
children | e1a230cc4527 ae6fddf39933 |
comparison
equal
deleted
inserted
replaced
3153:544354cfc626 | 3154:406992d0d611 |
---|---|
719 Check import reports new unstable changeset: | 719 Check import reports new unstable changeset: |
720 | 720 |
721 $ hg up --hidden 2 | 721 $ hg up --hidden 2 |
722 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 722 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
723 working directory parent is obsolete! (4538525df7e2) | 723 working directory parent is obsolete! (4538525df7e2) |
724 (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) | 724 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
725 $ hg export 9468a5f5d8b2 | hg import - | 725 $ hg export 9468a5f5d8b2 | hg import - |
726 applying patch from stdin | 726 applying patch from stdin |
727 1 new orphan changesets | 727 1 new orphan changesets |
728 | 728 |
729 | 729 |