equal
deleted
inserted
replaced
520 adding changesets |
520 adding changesets |
521 adding manifests |
521 adding manifests |
522 adding file changes |
522 adding file changes |
523 added 1 changesets with 1 changes to 1 files |
523 added 1 changesets with 1 changes to 1 files |
524 pull obsolescence markers |
524 pull obsolescence markers |
525 1 markers added |
525 1 obsolescence markers added |
526 (run 'hg update' to get a working copy) |
526 (run 'hg update' to get a working copy) |
527 $ hg log -G |
527 $ hg log -G |
528 o 75954b8cd933 (public): bathroom stuff |
528 o 75954b8cd933 (public): bathroom stuff |
529 | |
529 | |
530 o a224f2a4fb9f (public): SPAM SPAM |
530 o a224f2a4fb9f (public): SPAM SPAM |
578 adding changesets |
578 adding changesets |
579 adding manifests |
579 adding manifests |
580 adding file changes |
580 adding file changes |
581 added 1 changesets with 1 changes to 1 files |
581 added 1 changesets with 1 changes to 1 files |
582 pull obsolescence markers |
582 pull obsolescence markers |
583 1 markers added |
583 1 obsolescence markers added |
584 (run 'hg update' to get a working copy) |
584 (run 'hg update' to get a working copy) |
585 $ hg log -G |
585 $ hg log -G |
586 o 75954b8cd933 (draft): bathroom stuff |
586 o 75954b8cd933 (draft): bathroom stuff |
587 | |
587 | |
588 o a224f2a4fb9f (public): SPAM SPAM |
588 o a224f2a4fb9f (public): SPAM SPAM |
639 adding changesets |
639 adding changesets |
640 adding manifests |
640 adding manifests |
641 adding file changes |
641 adding file changes |
642 added 1 changesets with 1 changes to 1 files (+1 heads) |
642 added 1 changesets with 1 changes to 1 files (+1 heads) |
643 pull obsolescence markers |
643 pull obsolescence markers |
644 0 markers added |
644 0 obsolescence markers added |
645 (run 'hg heads' to see heads, 'hg merge' to merge) |
645 (run 'hg heads' to see heads, 'hg merge' to merge) |
646 1 new unstable changesets |
646 1 new unstable changesets |
647 |
647 |
648 |
648 |
649 The new changeset "animal" is based on an old changeset of "bathroom". You can |
649 The new changeset "animal" is based on an old changeset of "bathroom". You can |
738 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
738 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
739 pulling from $TESTTMP/local |
739 pulling from $TESTTMP/local |
740 searching for changes |
740 searching for changes |
741 no changes found |
741 no changes found |
742 pull obsolescence markers |
742 pull obsolescence markers |
743 0 markers added |
743 0 obsolescence markers added |
744 working directory parent is obsolete! |
744 working directory parent is obsolete! |
745 |
745 |
746 now let's see where we are, and update to the successor |
746 now let's see where we are, and update to the successor |
747 |
747 |
748 $ hg parents |
748 $ hg parents |
769 adding changesets |
769 adding changesets |
770 adding manifests |
770 adding manifests |
771 adding file changes |
771 adding file changes |
772 added 1 changesets with 1 changes to 1 files |
772 added 1 changesets with 1 changes to 1 files |
773 pull obsolescence markers |
773 pull obsolescence markers |
774 0 markers added |
774 0 obsolescence markers added |
775 (run 'hg update' to get a working copy) |
775 (run 'hg update' to get a working copy) |
776 $ hg log -G |
776 $ hg log -G |
777 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
777 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
778 | |
778 | |
779 @ ee942144f952 (draft): animals |
779 @ ee942144f952 (draft): animals |