equal
deleted
inserted
replaced
287 |
287 |
288 I have a new commit but I realize that don't want it. (transport shop list does |
288 I have a new commit but I realize that don't want it. (transport shop list does |
289 not fit well in my standard shopping list) |
289 not fit well in my standard shopping list) |
290 |
290 |
291 $ hg prune . # "." is for working directory parent |
291 $ hg prune . # "." is for working directory parent |
292 1 changesets pruned |
|
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
292 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
294 working directory now at 41aff6a42b75 |
293 working directory now at 41aff6a42b75 |
|
294 1 changesets pruned |
295 |
295 |
296 The silly changeset is gone. |
296 The silly changeset is gone. |
297 |
297 |
298 $ hg log -G |
298 $ hg log -G |
299 @ 41aff6a42b75 (draft): adding fruit |
299 @ 41aff6a42b75 (draft): adding fruit |
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 (* bytes) (glob) |
409 pushing 6 obsolescence markers (529 bytes) |
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 (* bytes) (glob) |
741 pushing 10 obsolescence markers (873 bytes) |
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 |
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! |
753 working directory parent is obsolete! |
|
754 (use "hg evolve" to update to its successor) |
754 |
755 |
755 now let's see where we are, and update to the successor |
756 now let's see where we are, and update to the successor |
756 |
757 |
757 $ hg parents |
758 $ hg parents |
758 bf1b0d202029 (draft): animals |
759 bf1b0d202029 (draft): animals |
759 working directory parent is obsolete! |
760 working directory parent is obsolete! |
|
761 (use "hg evolve" to update to its successor) |
760 $ hg evolve |
762 $ hg evolve |
761 update:[8] animals |
763 update:[8] animals |
762 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
764 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
763 working directory is now at ee942144f952 |
765 working directory is now at ee942144f952 |
764 |
766 |
802 |
804 |
803 |
805 |
804 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: |
806 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: |
805 |
807 |
806 $ hg prune ee942144f952 |
808 $ hg prune ee942144f952 |
807 1 changesets pruned |
|
808 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
809 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
809 working directory now at a44c85f957d3 |
810 working directory now at a44c85f957d3 |
|
811 1 changesets pruned |
810 1 new unstable changesets |
812 1 new unstable changesets |
811 |
813 |
812 |
814 |
813 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
815 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
814 is neither dead or obsolete. My repository is in an unstable state again. |
816 is neither dead or obsolete. My repository is in an unstable state again. |