692 [4] add obsol_c' |
692 [4] add obsol_c' |
693 [10] add obsol_c |
693 [10] add obsol_c |
694 [2] |
694 [2] |
695 $ hg olog |
695 $ hg olog |
696 @ 0d3f46688ccc (3) add obsol_c |
696 @ 0d3f46688ccc (3) add obsol_c |
697 | rewritten(parent) by test (*) as 2033b4e49474 (glob) |
697 | rewritten(parent) as 2033b4e49474 by test (*) (glob) |
698 | rewritten by test (*) as 725c380fe99b (glob) |
698 | rewritten as 725c380fe99b by test (*) (glob) |
699 | |
699 | |
700 x 4538525df7e2 (2) add c |
700 x 4538525df7e2 (2) add c |
701 rewritten by test (*) as 0d3f46688ccc (glob) |
701 rewritten as 0d3f46688ccc by test (*) (glob) |
702 |
702 |
703 |
703 |
704 Check import reports new unstable changeset: |
704 Check import reports new unstable changeset: |
705 |
705 |
706 $ hg up --hidden 2 |
706 $ hg up --hidden 2 |
707 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
707 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
708 working directory parent is obsolete! (4538525df7e2) |
708 working directory parent is obsolete! (4538525df7e2) |
709 (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue) |
709 (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
710 $ hg export 9468a5f5d8b2 | hg import - |
710 $ hg export 9468a5f5d8b2 | hg import - |
711 applying patch from stdin |
711 applying patch from stdin |
712 1 new unstable changesets |
712 1 new unstable changesets |
713 |
713 |
714 |
714 |