equal
deleted
inserted
replaced
578 changeset: 12:6db5e282cb91 |
578 changeset: 12:6db5e282cb91 |
579 tag: tip |
579 tag: tip |
580 parent: 10:2033b4e49474 |
580 parent: 10:2033b4e49474 |
581 user: test |
581 user: test |
582 date: Thu Jan 01 00:00:00 1970 +0000 |
582 date: Thu Jan 01 00:00:00 1970 +0000 |
|
583 trouble: bumped |
583 summary: add obsol_d''' |
584 summary: add obsol_d''' |
584 |
585 |
585 $ hg push ../other-new/ |
586 $ hg push ../other-new/ |
586 pushing to ../other-new/ |
587 pushing to ../other-new/ |
587 searching for changes |
588 searching for changes |
607 | |
608 | |
608 | o changeset: 12:6db5e282cb91 |
609 | o changeset: 12:6db5e282cb91 |
609 |/ parent: 10:2033b4e49474 |
610 |/ parent: 10:2033b4e49474 |
610 | user: test |
611 | user: test |
611 | date: Thu Jan 01 00:00:00 1970 +0000 |
612 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
613 | trouble: bumped |
612 | summary: add obsol_d''' |
614 | summary: add obsol_d''' |
613 | |
615 | |
614 | o changeset: 11:9468a5f5d8b2 |
616 | o changeset: 11:9468a5f5d8b2 |
615 |/ user: test |
617 |/ user: test |
616 | date: Thu Jan 01 00:00:00 1970 +0000 |
618 | date: Thu Jan 01 00:00:00 1970 +0000 |
670 $ hg log -r 'divergent()' |
672 $ hg log -r 'divergent()' |
671 changeset: 12:6db5e282cb91 |
673 changeset: 12:6db5e282cb91 |
672 parent: 10:2033b4e49474 |
674 parent: 10:2033b4e49474 |
673 user: test |
675 user: test |
674 date: Thu Jan 01 00:00:00 1970 +0000 |
676 date: Thu Jan 01 00:00:00 1970 +0000 |
|
677 trouble: bumped, divergent |
675 summary: add obsol_d''' |
678 summary: add obsol_d''' |
676 |
679 |
677 changeset: 16:50f11e5e3a63 |
680 changeset: 16:50f11e5e3a63 |
678 tag: tip |
681 tag: tip |
679 parent: 11:9468a5f5d8b2 |
682 parent: 11:9468a5f5d8b2 |
680 user: test |
683 user: test |
681 date: Thu Jan 01 00:00:00 1970 +0000 |
684 date: Thu Jan 01 00:00:00 1970 +0000 |
|
685 trouble: divergent |
682 summary: add obsolet_conflicting_d |
686 summary: add obsolet_conflicting_d |
683 |
687 |
684 |
688 |
685 $ hg up --hidden 3 -q |
689 $ hg up --hidden 3 -q |
686 working directory parent is obsolete! |
690 working directory parent is obsolete! |
714 @ changeset: 17:a5f7a21fe7bc |
718 @ changeset: 17:a5f7a21fe7bc |
715 | tag: tip |
719 | tag: tip |
716 | parent: 2:4538525df7e2 |
720 | parent: 2:4538525df7e2 |
717 | user: test |
721 | user: test |
718 | date: Thu Jan 01 00:00:00 1970 +0000 |
722 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
723 | trouble: unstable |
719 | summary: add obsol_d'' |
724 | summary: add obsol_d'' |
720 | |
725 | |
721 | o changeset: 16:50f11e5e3a63 |
726 | o changeset: 16:50f11e5e3a63 |
722 | | parent: 11:9468a5f5d8b2 |
727 | | parent: 11:9468a5f5d8b2 |
723 | | user: test |
728 | | user: test |
724 | | date: Thu Jan 01 00:00:00 1970 +0000 |
729 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
730 | | trouble: divergent |
725 | | summary: add obsolet_conflicting_d |
731 | | summary: add obsolet_conflicting_d |
726 | | |
732 | | |
727 | | o changeset: 15:705ab2a6b72e |
733 | | o changeset: 15:705ab2a6b72e |
728 | | | parent: 10:2033b4e49474 |
734 | | | parent: 10:2033b4e49474 |
729 | | | user: test |
735 | | | user: test |
743 | | | |
749 | | | |
744 | | | o changeset: 12:6db5e282cb91 |
750 | | | o changeset: 12:6db5e282cb91 |
745 | | |/ parent: 10:2033b4e49474 |
751 | | |/ parent: 10:2033b4e49474 |
746 | | | user: test |
752 | | | user: test |
747 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
753 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
754 | | | trouble: bumped, divergent |
748 | | | summary: add obsol_d''' |
755 | | | summary: add obsol_d''' |
749 | | | |
756 | | | |
750 | o | changeset: 11:9468a5f5d8b2 |
757 | o | changeset: 11:9468a5f5d8b2 |
751 | |/ user: test |
758 | |/ user: test |
752 | | date: Thu Jan 01 00:00:00 1970 +0000 |
759 | | date: Thu Jan 01 00:00:00 1970 +0000 |