equal
deleted
inserted
replaced
692 Check import reports new unstable changeset: |
692 Check import reports new unstable changeset: |
693 |
693 |
694 $ hg up --hidden 2 |
694 $ hg up --hidden 2 |
695 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
695 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
696 working directory parent is obsolete! (4538525df7e2) |
696 working directory parent is obsolete! (4538525df7e2) |
697 (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue) |
697 (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
698 $ hg export 9468a5f5d8b2 | hg import - |
698 $ hg export 9468a5f5d8b2 | hg import - |
699 applying patch from stdin |
699 applying patch from stdin |
700 1 new unstable changesets |
700 1 new unstable changesets |
701 |
701 |
702 |
702 |