404 searching for changes |
404 searching for changes |
405 adding changesets |
405 adding changesets |
406 adding manifests |
406 adding manifests |
407 adding file changes |
407 adding file changes |
408 added 3 changesets with 3 changes to 1 files |
408 added 3 changesets with 3 changes to 1 files |
409 pushing 6 obsolescence markers (529 bytes) |
409 pushing 6 obsolescence markers (*) (glob) |
410 6 obsolescence markers added |
410 6 obsolescence markers added |
411 |
411 |
412 for simplicity sake we get the bathroom change in line again |
412 for simplicity sake we get the bathroom change in line again |
413 |
413 |
414 $ hg grab 10b8aeaa8cc8 |
414 $ hg grab 10b8aeaa8cc8 |
736 searching for changes |
736 searching for changes |
737 adding changesets |
737 adding changesets |
738 adding manifests |
738 adding manifests |
739 adding file changes |
739 adding file changes |
740 added 2 changesets with 2 changes to 1 files (+1 heads) |
740 added 2 changesets with 2 changes to 1 files (+1 heads) |
741 pushing 10 obsolescence markers (873 bytes) |
741 pushing 10 obsolescence markers (*) (glob) |
742 3 obsolescence markers added |
742 3 obsolescence markers added |
743 |
743 |
744 remote get a warning that current working directory is based on an obsolete changeset |
744 remote get a warning that current working directory is based on an obsolete changeset |
745 |
745 |
746 $ cd ../remote |
746 $ cd ../remote |
747 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
747 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
748 pulling from $TESTTMP/local (glob) |
748 pulling from $TESTTMP/local |
749 searching for changes |
749 searching for changes |
750 no changes found |
750 no changes found |
751 pull obsolescence markers |
751 pull obsolescence markers |
752 0 obsolescence markers added |
752 0 obsolescence markers added |
753 working directory parent is obsolete! |
|
754 (use "hg evolve" to update to its successor) |
|
755 |
753 |
756 now let's see where we are, and update to the successor |
754 now let's see where we are, and update to the successor |
757 |
755 |
758 $ hg parents |
756 $ hg parents |
759 bf1b0d202029 (draft): animals |
757 bf1b0d202029 (draft): animals |
760 working directory parent is obsolete! |
|
761 (use "hg evolve" to update to its successor) |
|
762 $ hg evolve |
758 $ hg evolve |
763 update:[8] animals |
759 update:[8] animals |
764 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
760 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
765 working directory is now at ee942144f952 |
761 working directory is now at ee942144f952 |
766 |
762 |