Mercurial > evolve
comparison docs/tutorials/tutorial.t @ 217:786eb34d93ea
obsolete: refuse to push unstable changeset without -f
We do not alter phase of suspended and unstable changeset anymore. But push
refuse to push them without force.
The extinct part of the history stay secret for simplicity shake.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Tue, 24 Apr 2012 16:30:58 +0200 |
| parents | 69a37d56c7fb |
| children | f60555898df4 |
comparison
equal
deleted
inserted
replaced
| 216:9400e234b3d7 | 217:786eb34d93ea |
|---|---|
| 493 adding file changes | 493 adding file changes |
| 494 added 1 changesets with 1 changes to 1 files (+1 heads) | 494 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 495 (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 | 496 1 new unstables changesets |
| 497 $ hg log | 497 $ hg log |
| 498 9ac5d0e790a2 (secret): animals | 498 9ac5d0e790a2 (draft): animals |
| 499 ffa278c50818 (draft): bathroom stuff | 499 ffa278c50818 (draft): bathroom stuff |
| 500 8a79ae8b029e (secret): bathroom stuff | 500 8a79ae8b029e (draft): bathroom stuff |
| 501 a2fccc2e7b08 (public): SPAM SPAM | 501 a2fccc2e7b08 (public): SPAM SPAM |
| 502 387187ad9bd9 (public): adding fruit | 502 387187ad9bd9 (public): adding fruit |
| 503 dfd3a2d7691e (public): adding condiment | 503 dfd3a2d7691e (public): adding condiment |
| 504 9ca060c80d74 (public): SPAM | 504 9ca060c80d74 (public): SPAM |
| 505 7e82d3f3c2cb (public): Monthy Python Shopping list | 505 7e82d3f3c2cb (public): Monthy Python Shopping list |
| 506 | 506 |
| 507 # XXX Changeset have turned secret because of current implementation of mutable. | |
| 508 | 507 |
| 509 The new changeset "animal" is based one an old changeset of "bathroom". You can | 508 The new changeset "animal" is based one an old changeset of "bathroom". You can |
| 510 see both version showing up the log. | 509 see both version showing up the log. |
| 511 | 510 |
| 512 $ hg glog | 511 $ hg glog |
| 513 o 9ac5d0e790a2 (secret): animals | 512 o 9ac5d0e790a2 (draft): animals |
| 514 | | 513 | |
| 515 | @ ffa278c50818 (draft): bathroom stuff | 514 | @ ffa278c50818 (draft): bathroom stuff |
| 516 | | | 515 | | |
| 517 o | 8a79ae8b029e (secret): bathroom stuff | 516 o | 8a79ae8b029e (draft): bathroom stuff |
| 518 |/ | 517 |/ |
| 519 o a2fccc2e7b08 (public): SPAM SPAM | 518 o a2fccc2e7b08 (public): SPAM SPAM |
| 520 | | 519 | |
| 521 o 387187ad9bd9 (public): adding fruit | 520 o 387187ad9bd9 (public): adding fruit |
| 522 | | 521 | |
| 546 merging shopping | 545 merging shopping |
| 547 | 546 |
| 548 The old version of bathroom is hidden again now. | 547 The old version of bathroom is hidden again now. |
| 549 | 548 |
| 550 $ hg log | 549 $ hg log |
| 551 437efbcaf700 (secret): animals | 550 437efbcaf700 (draft): animals |
| 552 ffa278c50818 (draft): bathroom stuff | 551 ffa278c50818 (draft): bathroom stuff |
| 553 a2fccc2e7b08 (public): SPAM SPAM | 552 a2fccc2e7b08 (public): SPAM SPAM |
| 554 387187ad9bd9 (public): adding fruit | 553 387187ad9bd9 (public): adding fruit |
| 555 dfd3a2d7691e (public): adding condiment | 554 dfd3a2d7691e (public): adding condiment |
| 556 9ca060c80d74 (public): SPAM | 555 9ca060c80d74 (public): SPAM |
| 557 7e82d3f3c2cb (public): Monthy Python Shopping list | 556 7e82d3f3c2cb (public): Monthy Python Shopping list |
| 558 | 557 |
| 559 XXX remove me when fixed | |
| 560 restore a proper phase for animals | |
| 561 | |
| 562 $ hg ph -dv 437efbcaf700 | |
| 563 phase changed for 1 changesets | |
| 564 | 558 |
| 565 We can push this evolution to remote | 559 We can push this evolution to remote |
| 566 | 560 |
| 567 $ hg push -f remote # XXX should not require -f | 561 $ hg push -f remote # XXX should not require -f |
| 568 pushing to $TESTTMP/remote | 562 pushing to $TESTTMP/remote |
| 621 | 615 |
| 622 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset | 616 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
| 623 is neither dead or obsolete. My repository is in an unstable state again. | 617 is neither dead or obsolete. My repository is in an unstable state again. |
| 624 | 618 |
| 625 $ hg log | 619 $ hg log |
| 626 ae45c0c3092a (secret): SPAM SPAM SPAM | 620 ae45c0c3092a (draft): SPAM SPAM SPAM |
| 627 437efbcaf700 (secret): animals | 621 437efbcaf700 (draft): animals |
| 628 ffa278c50818 (draft): bathroom stuff | 622 ffa278c50818 (draft): bathroom stuff |
| 629 a2fccc2e7b08 (public): SPAM SPAM | 623 a2fccc2e7b08 (public): SPAM SPAM |
| 630 387187ad9bd9 (public): adding fruit | 624 387187ad9bd9 (public): adding fruit |
| 631 dfd3a2d7691e (public): adding condiment | 625 dfd3a2d7691e (public): adding condiment |
| 632 9ca060c80d74 (public): SPAM | 626 9ca060c80d74 (public): SPAM |
| 633 7e82d3f3c2cb (public): Monthy Python Shopping list | 627 7e82d3f3c2cb (public): Monthy Python Shopping list |
| 634 | 628 |
| 635 $ hg log -r 'unstable()' | 629 $ hg log -r 'unstable()' |
| 636 ae45c0c3092a (secret): SPAM SPAM SPAM | 630 ae45c0c3092a (draft): SPAM SPAM SPAM |
| 637 | 631 |
| 638 $ hg log -G | 632 $ hg log -G |
| 639 o ae45c0c3092a (secret): SPAM SPAM SPAM | 633 o ae45c0c3092a (draft): SPAM SPAM SPAM |
| 640 | | 634 | |
| 641 o 437efbcaf700 (secret): animals | 635 o 437efbcaf700 (draft): animals |
| 642 | | 636 | |
| 643 @ ffa278c50818 (draft): bathroom stuff | 637 @ ffa278c50818 (draft): bathroom stuff |
| 644 | | 638 | |
| 645 o a2fccc2e7b08 (public): SPAM SPAM | 639 o a2fccc2e7b08 (public): SPAM SPAM |
| 646 | | 640 | |