Mercurial > evolve
comparison docs/obs-terms.rst @ 1697:093c445fd86a mercurial-3.6
merge with stable through 3.7 branch
dropped the topic test and updated output with some minor difference
Hg: Enter commit message. Lines beginning with 'HG:' are removed.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 05 May 2016 23:51:35 +0200 |
parents | ec4167ac79ab |
children | 07ce6c063c61 |
comparison
equal
deleted
inserted
replaced
1604:61dd08f4dc62 | 1697:093c445fd86a |
---|---|
18 - no *successor*: the *precursor* is just discarded. | 18 - no *successor*: the *precursor* is just discarded. |
19 - one *successor*: the *precursor* has been rewritten | 19 - one *successor*: the *precursor* has been rewritten |
20 - multiple *successors*: the *precursor* were splits in multiple | 20 - multiple *successors*: the *precursor* were splits in multiple |
21 changesets. | 21 changesets. |
22 | 22 |
23 .. The *precursors* and *successors* terms can be used on changeset directy: | 23 .. The *precursors* and *successors* terms can be used on changeset directly: |
24 | 24 |
25 .. :precursors: of a changeset `A` are changesets used as *precursors* by | 25 .. :precursors: of a changeset `A` are changesets used as *precursors* by |
26 .. obsolete marker using changeset `A` as *successors* | 26 .. obsolete marker using changeset `A` as *successors* |
27 | 27 |
28 .. :successors: of a changeset `B` are changesets used as *successors* by | 28 .. :successors: of a changeset `B` are changesets used as *successors* by |
82 | | | | | 82 | | | | |
83 | | | *suspended* changeset is | | 83 | | | *suspended* changeset is | |
84 | | | *obsolete* with at least | | 84 | | | *obsolete* with at least | |
85 | | | one non-obsolete descendant | | 85 | | | one non-obsolete descendant | |
86 | | | | | 86 | | | | |
87 | | | Thoses descendants prevent | | 87 | | | Those descendants prevent | |
88 | | | properties of extincts | | 88 | | | properties of extinct | |
89 | | | changesets to apply. But | | 89 | | | changesets to apply. But | |
90 | | | they will refuse to be | | 90 | | | they will refuse to be | |
91 | | | pushed without --force. | | 91 | | | pushed without --force. | |
92 | | | | | 92 | | | | |
93 | +--------------------------+-----------------------------+ | 93 | +--------------------------+-----------------------------+ |
167 | Changesets in the *public* phases. | | 167 | Changesets in the *public* phases. | |
168 | | | 168 | | |
169 | Rewriting operation refuse to work on immutable changeset. | | 169 | Rewriting operation refuse to work on immutable changeset. | |
170 | | | 170 | | |
171 | Obsolete markers that refer an immutable changeset as precursors have | | 171 | Obsolete markers that refer an immutable changeset as precursors have | |
172 | no effect on the precussors but may have effect on the successors. | | 172 | no effect on the precursors but may have effect on the successors. | |
173 | | | 173 | | |
174 | When a *mutable* changeset becomes *immutable* (changing its phase from draft| | 174 | When a *mutable* changeset becomes *immutable* (changing its phase from draft| |
175 | to public) it is just *immutable* and loose any property of it's former | | 175 | to public) it is just *immutable* and loose any property of it's former | |
176 | state. | | 176 | state. | |
177 | | | 177 | | |