equal
deleted
inserted
replaced
623 @ changeset: 3:65b757b745b9 |
623 @ changeset: 3:65b757b745b9 |
624 | tag: tip |
624 | tag: tip |
625 | parent: 0:ea207398892e |
625 | parent: 0:ea207398892e |
626 | user: test |
626 | user: test |
627 | date: Thu Jan 01 00:00:00 1970 +0000 |
627 | date: Thu Jan 01 00:00:00 1970 +0000 |
628 | instability: divergent |
628 | instability: content-divergent |
629 | summary: A2 |
629 | summary: A2 |
630 | |
630 | |
631 | o changeset: 2:fdf9bde5129a |
631 | o changeset: 2:fdf9bde5129a |
632 |/ parent: 0:ea207398892e |
632 |/ parent: 0:ea207398892e |
633 | user: test |
633 | user: test |
634 | date: Thu Jan 01 00:00:00 1970 +0000 |
634 | date: Thu Jan 01 00:00:00 1970 +0000 |
635 | instability: divergent |
635 | instability: content-divergent |
636 | summary: A1 |
636 | summary: A1 |
637 | |
637 | |
638 | x changeset: 1:471f378eab4c |
638 | x changeset: 1:471f378eab4c |
639 |/ user: test |
639 |/ user: test |
640 | date: Thu Jan 01 00:00:00 1970 +0000 |
640 | date: Thu Jan 01 00:00:00 1970 +0000 |
653 --------------- |
653 --------------- |
654 |
654 |
655 $ hg up 'desc(A0)' --hidden |
655 $ hg up 'desc(A0)' --hidden |
656 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
656 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
657 working directory parent is obsolete! (471f378eab4c) |
657 working directory parent is obsolete! (471f378eab4c) |
658 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) |
658 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
659 |
659 |
660 Precursors template should show current revision as it is the working copy |
660 Precursors template should show current revision as it is the working copy |
661 $ hg tlog |
661 $ hg tlog |
662 o 019fadeab383 |
662 o 019fadeab383 |
663 | Precursors: 471f378eab4c |
663 | Precursors: 471f378eab4c |