equal
deleted
inserted
replaced
222 searching for changes |
222 searching for changes |
223 adding changesets |
223 adding changesets |
224 adding manifests |
224 adding manifests |
225 adding file changes |
225 adding file changes |
226 added 1 changesets with 1 changes to 1 files (+1 heads) |
226 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
227 OBSEXC: pull obsolescence markers |
|
228 OBSEXC: DONE |
227 (run 'hg heads' to see heads, 'hg merge' to merge) |
229 (run 'hg heads' to see heads, 'hg merge' to merge) |
228 |
230 |
229 I now have a new heads. Note that this remote head is immutable |
231 I now have a new heads. Note that this remote head is immutable |
230 |
232 |
231 $ hg log -G |
233 $ hg log -G |
512 searching for changes |
514 searching for changes |
513 adding changesets |
515 adding changesets |
514 adding manifests |
516 adding manifests |
515 adding file changes |
517 adding file changes |
516 added 1 changesets with 1 changes to 1 files |
518 added 1 changesets with 1 changes to 1 files |
|
519 OBSEXC: pull obsolescence markers |
|
520 OBSEXC: merging obsolescence markers (560 bytes) |
|
521 OBSEXC: 1 markers added |
|
522 OBSEXC: DONE |
517 (run 'hg update' to get a working copy) |
523 (run 'hg update' to get a working copy) |
518 $ hg log -G |
524 $ hg log -G |
519 o 75954b8cd933 (public): bathroom stuff |
525 o 75954b8cd933 (public): bathroom stuff |
520 | |
526 | |
521 o a224f2a4fb9f (public): SPAM SPAM |
527 o a224f2a4fb9f (public): SPAM SPAM |
568 searching for changes |
574 searching for changes |
569 adding changesets |
575 adding changesets |
570 adding manifests |
576 adding manifests |
571 adding file changes |
577 adding file changes |
572 added 1 changesets with 1 changes to 1 files |
578 added 1 changesets with 1 changes to 1 files |
|
579 OBSEXC: pull obsolescence markers |
|
580 OBSEXC: merging obsolescence markers (560 bytes) |
|
581 OBSEXC: 1 markers added |
|
582 OBSEXC: DONE |
573 (run 'hg update' to get a working copy) |
583 (run 'hg update' to get a working copy) |
574 $ hg log -G |
584 $ hg log -G |
575 o 75954b8cd933 (draft): bathroom stuff |
585 o 75954b8cd933 (draft): bathroom stuff |
576 | |
586 | |
577 o a224f2a4fb9f (public): SPAM SPAM |
587 o a224f2a4fb9f (public): SPAM SPAM |
627 searching for changes |
637 searching for changes |
628 adding changesets |
638 adding changesets |
629 adding manifests |
639 adding manifests |
630 adding file changes |
640 adding file changes |
631 added 1 changesets with 1 changes to 1 files (+1 heads) |
641 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
642 OBSEXC: pull obsolescence markers |
|
643 OBSEXC: merging obsolescence markers (560 bytes) |
|
644 OBSEXC: 0 markers added |
|
645 OBSEXC: DONE |
632 (run 'hg heads' to see heads, 'hg merge' to merge) |
646 (run 'hg heads' to see heads, 'hg merge' to merge) |
633 1 new unstable changesets |
647 1 new unstable changesets |
634 |
648 |
635 |
649 |
636 The new changeset "animal" is based on an old changeset of "bathroom". You can |
650 The new changeset "animal" is based on an old changeset of "bathroom". You can |
728 $ cd ../remote |
742 $ cd ../remote |
729 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
743 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
730 pulling from $TESTTMP/local |
744 pulling from $TESTTMP/local |
731 searching for changes |
745 searching for changes |
732 no changes found |
746 no changes found |
|
747 OBSEXC: pull obsolescence markers |
|
748 OBSEXC: merging obsolescence markers (803 bytes) |
|
749 OBSEXC: 0 markers added |
|
750 OBSEXC: DONE |
733 working directory parent is obsolete! |
751 working directory parent is obsolete! |
734 |
752 |
735 now let's see where we are, and update to the successor |
753 now let's see where we are, and update to the successor |
736 |
754 |
737 $ hg parents |
755 $ hg parents |
757 searching for changes |
775 searching for changes |
758 adding changesets |
776 adding changesets |
759 adding manifests |
777 adding manifests |
760 adding file changes |
778 adding file changes |
761 added 1 changesets with 1 changes to 1 files |
779 added 1 changesets with 1 changes to 1 files |
|
780 OBSEXC: pull obsolescence markers |
|
781 OBSEXC: merging obsolescence markers (803 bytes) |
|
782 OBSEXC: 0 markers added |
|
783 OBSEXC: DONE |
762 (run 'hg update' to get a working copy) |
784 (run 'hg update' to get a working copy) |
763 $ hg log -G |
785 $ hg log -G |
764 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
786 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
765 | |
787 | |
766 @ ee942144f952 (draft): animals |
788 @ ee942144f952 (draft): animals |