equal
deleted
inserted
replaced
451 387187ad9bd9 (public): adding fruit |
451 387187ad9bd9 (public): adding fruit |
452 dfd3a2d7691e (public): adding condiment |
452 dfd3a2d7691e (public): adding condiment |
453 9ca060c80d74 (public): SPAM |
453 9ca060c80d74 (public): SPAM |
454 7e82d3f3c2cb (public): Monthy Python Shopping list |
454 7e82d3f3c2cb (public): Monthy Python Shopping list |
455 |
455 |
456 Rebasing unstable change after update |
456 Rebasing unstable change after pull |
457 ---------------------------------------------- |
457 ---------------------------------------------- |
458 |
458 |
459 Remotely someone add a new changeset on top of our mutable "bathroom" on. |
459 Remotely someone add a new changeset on top of our mutable "bathroom" on. |
460 |
460 |
461 $ hg up 8a79ae8b029e -q |
461 $ hg up 8a79ae8b029e -q |
482 7e82d3f3c2cb (public): Monthy Python Shopping list |
482 7e82d3f3c2cb (public): Monthy Python Shopping list |
483 |
483 |
484 |
484 |
485 When we pull from remote again we get an unstable state! |
485 When we pull from remote again we get an unstable state! |
486 |
486 |
|
487 |
487 $ hg pull remote |
488 $ hg pull remote |
488 pulling from $TESTTMP/remote |
489 pulling from $TESTTMP/remote |
489 searching for changes |
490 searching for changes |
490 adding changesets |
491 adding changesets |
491 adding manifests |
492 adding manifests |
492 adding file changes |
493 adding file changes |
493 added 1 changesets with 1 changes to 1 files (+1 heads) |
494 added 1 changesets with 1 changes to 1 files (+1 heads) |
494 (run 'hg heads .' to see heads, 'hg merge' to merge) |
495 (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
496 1 new unstables changesets |
495 $ hg log |
497 $ hg log |
496 9ac5d0e790a2 (secret): animals |
498 9ac5d0e790a2 (secret): animals |
497 ffa278c50818 (draft): bathroom stuff |
499 ffa278c50818 (draft): bathroom stuff |
498 8a79ae8b029e (secret): bathroom stuff |
500 8a79ae8b029e (secret): bathroom stuff |
499 a2fccc2e7b08 (public): SPAM SPAM |
501 a2fccc2e7b08 (public): SPAM SPAM |
609 9ca060c80d74 (public): SPAM |
611 9ca060c80d74 (public): SPAM |
610 7e82d3f3c2cb (public): Monthy Python Shopping list |
612 7e82d3f3c2cb (public): Monthy Python Shopping list |
611 |
613 |
612 In the mean time I noticed you can't buy animals in a super market and I kill the animal changeset: |
614 In the mean time I noticed you can't buy animals in a super market and I kill the animal changeset: |
613 |
615 |
614 $ hg kill 437efbcaf700 # XXX issue a warning here |
616 $ hg kill 437efbcaf700 |
615 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
617 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
616 working directory now at ffa278c50818 |
618 working directory now at ffa278c50818 |
|
619 1 new unstables changesets |
617 |
620 |
618 |
621 |
619 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
622 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
620 is neither dead or obsolete. My repository is in an unstable state again. |
623 is neither dead or obsolete. My repository is in an unstable state again. |
621 |
624 |