Mercurial > evolve
diff 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 |
line wrap: on
line diff
--- a/docs/tutorials/tutorial.t Tue Apr 24 15:57:48 2012 +0200 +++ b/docs/tutorials/tutorial.t Tue Apr 24 16:30:58 2012 +0200 @@ -495,26 +495,25 @@ (run 'hg heads .' to see heads, 'hg merge' to merge) 1 new unstables changesets $ hg log - 9ac5d0e790a2 (secret): animals + 9ac5d0e790a2 (draft): animals ffa278c50818 (draft): bathroom stuff - 8a79ae8b029e (secret): bathroom stuff + 8a79ae8b029e (draft): bathroom stuff a2fccc2e7b08 (public): SPAM SPAM 387187ad9bd9 (public): adding fruit dfd3a2d7691e (public): adding condiment 9ca060c80d74 (public): SPAM 7e82d3f3c2cb (public): Monthy Python Shopping list -# XXX Changeset have turned secret because of current implementation of mutable. The new changeset "animal" is based one an old changeset of "bathroom". You can see both version showing up the log. $ hg glog - o 9ac5d0e790a2 (secret): animals + o 9ac5d0e790a2 (draft): animals | | @ ffa278c50818 (draft): bathroom stuff | | - o | 8a79ae8b029e (secret): bathroom stuff + o | 8a79ae8b029e (draft): bathroom stuff |/ o a2fccc2e7b08 (public): SPAM SPAM | @@ -548,7 +547,7 @@ The old version of bathroom is hidden again now. $ hg log - 437efbcaf700 (secret): animals + 437efbcaf700 (draft): animals ffa278c50818 (draft): bathroom stuff a2fccc2e7b08 (public): SPAM SPAM 387187ad9bd9 (public): adding fruit @@ -556,11 +555,6 @@ 9ca060c80d74 (public): SPAM 7e82d3f3c2cb (public): Monthy Python Shopping list -XXX remove me when fixed -restore a proper phase for animals - - $ hg ph -dv 437efbcaf700 - phase changed for 1 changesets We can push this evolution to remote @@ -623,8 +617,8 @@ is neither dead or obsolete. My repository is in an unstable state again. $ hg log - ae45c0c3092a (secret): SPAM SPAM SPAM - 437efbcaf700 (secret): animals + ae45c0c3092a (draft): SPAM SPAM SPAM + 437efbcaf700 (draft): animals ffa278c50818 (draft): bathroom stuff a2fccc2e7b08 (public): SPAM SPAM 387187ad9bd9 (public): adding fruit @@ -633,12 +627,12 @@ 7e82d3f3c2cb (public): Monthy Python Shopping list $ hg log -r 'unstable()' - ae45c0c3092a (secret): SPAM SPAM SPAM + ae45c0c3092a (draft): SPAM SPAM SPAM $ hg log -G - o ae45c0c3092a (secret): SPAM SPAM SPAM + o ae45c0c3092a (draft): SPAM SPAM SPAM | - o 437efbcaf700 (secret): animals + o 437efbcaf700 (draft): animals | @ ffa278c50818 (draft): bathroom stuff |