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 pull obsolescence markers |
227 (run 'hg heads' to see heads, 'hg merge' to merge) |
228 (run 'hg heads' to see heads, 'hg merge' to merge) |
228 |
229 |
229 I now have a new heads. Note that this remote head is immutable |
230 I now have a new heads. Note that this remote head is immutable |
230 |
231 |
231 $ hg log -G |
232 $ hg log -G |
403 searching for changes |
404 searching for changes |
404 adding changesets |
405 adding changesets |
405 adding manifests |
406 adding manifests |
406 adding file changes |
407 adding file changes |
407 added 3 changesets with 3 changes to 1 files |
408 added 3 changesets with 3 changes to 1 files |
408 6 new obsolescence markers |
409 pushing 6 obsolescence markers (52? bytes) (glob) |
|
410 6 obsolescence markers added |
409 |
411 |
410 for simplicity sake we get the bathroom change in line again |
412 for simplicity sake we get the bathroom change in line again |
411 |
413 |
412 $ hg grab 10b8aeaa8cc8 |
414 $ hg grab 10b8aeaa8cc8 |
413 rebasing 9:10b8aeaa8cc8 "bathroom stuff" |
415 rebasing 9:10b8aeaa8cc8 "bathroom stuff" |
523 searching for changes |
525 searching for changes |
524 adding changesets |
526 adding changesets |
525 adding manifests |
527 adding manifests |
526 adding file changes |
528 adding file changes |
527 added 1 changesets with 1 changes to 1 files |
529 added 1 changesets with 1 changes to 1 files |
528 1 new obsolescence markers |
530 pull obsolescence markers |
|
531 1 obsolescence markers added |
529 (run 'hg update' to get a working copy) |
532 (run 'hg update' to get a working copy) |
530 $ hg log -G |
533 $ hg log -G |
531 o 75954b8cd933 (public): bathroom stuff |
534 o 75954b8cd933 (public): bathroom stuff |
532 | |
535 | |
533 o a224f2a4fb9f (public): SPAM SPAM |
536 o a224f2a4fb9f (public): SPAM SPAM |
580 searching for changes |
583 searching for changes |
581 adding changesets |
584 adding changesets |
582 adding manifests |
585 adding manifests |
583 adding file changes |
586 adding file changes |
584 added 1 changesets with 1 changes to 1 files |
587 added 1 changesets with 1 changes to 1 files |
585 1 new obsolescence markers |
588 pull obsolescence markers |
|
589 1 obsolescence markers added |
586 (run 'hg update' to get a working copy) |
590 (run 'hg update' to get a working copy) |
587 $ hg log -G |
591 $ hg log -G |
588 o 75954b8cd933 (draft): bathroom stuff |
592 o 75954b8cd933 (draft): bathroom stuff |
589 | |
593 | |
590 o a224f2a4fb9f (public): SPAM SPAM |
594 o a224f2a4fb9f (public): SPAM SPAM |
640 searching for changes |
644 searching for changes |
641 adding changesets |
645 adding changesets |
642 adding manifests |
646 adding manifests |
643 adding file changes |
647 adding file changes |
644 added 1 changesets with 1 changes to 1 files (+1 heads) |
648 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
649 pull obsolescence markers |
|
650 0 obsolescence markers added |
645 (run 'hg heads' to see heads, 'hg merge' to merge) |
651 (run 'hg heads' to see heads, 'hg merge' to merge) |
646 1 new unstable changesets |
652 1 new unstable changesets |
647 |
653 |
648 |
654 |
649 The new changeset "animal" is based on an old changeset of "bathroom". You can |
655 The new changeset "animal" is based on an old changeset of "bathroom". You can |
729 searching for changes |
735 searching for changes |
730 adding changesets |
736 adding changesets |
731 adding manifests |
737 adding manifests |
732 adding file changes |
738 adding file changes |
733 added 2 changesets with 2 changes to 1 files (+1 heads) |
739 added 2 changesets with 2 changes to 1 files (+1 heads) |
734 3 new obsolescence markers |
740 pushing 10 obsolescence markers (87? bytes) (glob) |
|
741 3 obsolescence markers added |
735 |
742 |
736 remote get a warning that current working directory is based on an obsolete changeset |
743 remote get a warning that current working directory is based on an obsolete changeset |
737 |
744 |
738 $ cd ../remote |
745 $ cd ../remote |
739 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
746 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
740 pulling from $TESTTMP/local (glob) |
747 pulling from $TESTTMP/local (glob) |
741 searching for changes |
748 searching for changes |
742 no changes found |
749 no changes found |
|
750 pull obsolescence markers |
|
751 0 obsolescence markers added |
743 working directory parent is obsolete! |
752 working directory parent is obsolete! |
744 (use "hg evolve" to update to its successor) |
753 (use "hg evolve" to update to its successor) |
745 |
754 |
746 now let's see where we are, and update to the successor |
755 now let's see where we are, and update to the successor |
747 |
756 |
770 searching for changes |
779 searching for changes |
771 adding changesets |
780 adding changesets |
772 adding manifests |
781 adding manifests |
773 adding file changes |
782 adding file changes |
774 added 1 changesets with 1 changes to 1 files |
783 added 1 changesets with 1 changes to 1 files |
|
784 pull obsolescence markers |
|
785 0 obsolescence markers added |
775 (run 'hg update' to get a working copy) |
786 (run 'hg update' to get a working copy) |
776 $ hg log -G |
787 $ hg log -G |
777 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
788 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
778 | |
789 | |
779 @ ee942144f952 (draft): animals |
790 @ ee942144f952 (draft): animals |