equal
deleted
inserted
replaced
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 |