equal
deleted
inserted
replaced
717 Check import reports new unstable changeset: |
717 Check import reports new unstable changeset: |
718 |
718 |
719 $ hg up --hidden 2 |
719 $ hg up --hidden 2 |
720 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
720 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
721 working directory parent is obsolete! (4538525df7e2) |
721 working directory parent is obsolete! (4538525df7e2) |
722 (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
722 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
723 $ hg export 9468a5f5d8b2 | hg import - |
723 $ hg export 9468a5f5d8b2 | hg import - |
724 applying patch from stdin |
724 applying patch from stdin |
725 1 new unstable changesets |
725 1 new unstable changesets |
726 |
726 |
727 |
727 |