Mercurial > hg > mutable-history

comparison docs/evolve-collaboration.rst @ 232:adb7e29cb2bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs: proof-read and review
author Benoit Allard <benoit@aeteurope.nl>
date Wed, 09 May 2012 19:02:35 +0200
parents e7d7201e79ce
children b398e9c2dbd1
comparison
equal deleted inserted replaced
231:f589d054329a 232:adb7e29cb2bd
18 827: draft 18 827: draft
19 19
20 See ? Until the day it becomes a "public" changeset, this can be altered 20 See ? Until the day it becomes a "public" changeset, this can be altered
21 to no end. How ? It happens with an explicit:: 21 to no end. How ? It happens with an explicit::
22 22
23 $ hg phase -p 23 $ hg phase --public
24 24
25 In practice, pushing to a "publishing" repository can also turn draft 25 In practice, pushing to a "publishing" repository can also turn draft
26 changesets into public ones. Older mercurial releases are automatically 26 changesets into public ones. Older mercurial releases are automatically
27 "publishing" since they do not have the notion of non-public changesets 27 "publishing" since they do not have the notion of non-public changesets
28 (or mutable history). 28 (or mutable history).
106 W. for one, wouldn't want to merge each time he amends something that 106 W. for one, wouldn't want to merge each time he amends something that
107 might conflict with the descendant changesets; remember he is 107 might conflict with the descendant changesets; remember he is
108 currently updating the very middle of an history ! 108 currently updating the very middle of an history !
109 109
110 Being now done with grammar and typo fixes, W. decides it is time to 110 Being now done with grammar and typo fixes, W. decides it is time to
111 stabilize again the tree. He: 111 stabilize again the tree. He::
112 112
113 $ hg stabilize 113 $ hg stabilize
114 114
115 two times, one for each unstable descendant. The last time, hgview 115 two times, one for each unstable descendant. The last time, hgview
116 shows him a straight line again. Wow ! that feels a bit like a 116 shows him a straight line again. Wow ! that feels a bit like a
117 well-planned surgical operation. At the end, the patient^Wtree has 117 well-planned surgical operation. At the end, the patient tree has
118 been properly sewed and any conflict properly handled. 118 been properly sewed and any conflict properly handled.
119 119
120 Of course nothing fancy really happened: each "stablilize" can be 120 Of course nothing fancy really happened: each "stablilize" can be
121 understood in terms of a rebase of the next unstable descendant to the 121 understood in terms of a rebase of the next unstable descendant to the
122 newest version of its parent (including the possible manual conflict 122 newest version of its parent (including the possible manual conflict