equal
deleted
inserted
replaced
119 3 |
119 3 |
120 - 0d3f46688ccc |
120 - 0d3f46688ccc |
121 4 |
121 4 |
122 - 725c380fe99b |
122 - 725c380fe99b |
123 $ hg up --hidden 3 -q |
123 $ hg up --hidden 3 -q |
|
124 updating to a hidden changeset 0d3f46688ccc |
124 working directory parent is obsolete! (0d3f46688ccc) |
125 working directory parent is obsolete! (0d3f46688ccc) |
125 (reported by parents too) |
126 (reported by parents too) |
126 $ hg parents |
127 $ hg parents |
127 changeset: 3:0d3f46688ccc |
128 changeset: 3:0d3f46688ccc |
128 parent: 1:7c3bad9141dc |
129 parent: 1:7c3bad9141dc |
699 instability: content-divergent |
700 instability: content-divergent |
700 summary: add obsolet_conflicting_d |
701 summary: add obsolet_conflicting_d |
701 |
702 |
702 |
703 |
703 $ hg up --hidden 3 -q |
704 $ hg up --hidden 3 -q |
|
705 updating to a hidden changeset 0d3f46688ccc |
704 working directory parent is obsolete! (0d3f46688ccc) |
706 working directory parent is obsolete! (0d3f46688ccc) |
705 $ hg evolve |
707 $ hg evolve |
706 parent is obsolete with multiple successors: |
708 parent is obsolete with multiple successors: |
707 [4] add obsol_c' |
709 [4] add obsol_c' |
708 [10] add obsol_c |
710 [10] add obsol_c |
717 |
719 |
718 |
720 |
719 Check import reports new unstable changeset: |
721 Check import reports new unstable changeset: |
720 |
722 |
721 $ hg up --hidden 2 |
723 $ hg up --hidden 2 |
|
724 updating to a hidden changeset 4538525df7e2 |
722 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
725 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
723 working directory parent is obsolete! (4538525df7e2) |
726 working directory parent is obsolete! (4538525df7e2) |
724 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
727 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
725 $ hg export 9468a5f5d8b2 | hg import - |
728 $ hg export 9468a5f5d8b2 | hg import - |
726 applying patch from stdin |
729 applying patch from stdin |