Mercurial > evolve
comparison docs/obs-terms.rst @ 370:7ef8ab8c6fea stable 0.5
some more fix
author | Pierre-Yves.David@ens-lyon.org |
---|---|
date | Mon, 16 Jul 2012 16:57:17 +0200 |
parents | f348088d3b3f |
children | 7ecd41520dae |
comparison
equal
deleted
inserted
replaced
369:f348088d3b3f | 370:7ef8ab8c6fea |
---|---|
42 Obsolete markers may refer changesets that are not known locally. | 42 Obsolete markers may refer changesets that are not known locally. |
43 So, *direct precursors* of a changeset may be unknown locally. | 43 So, *direct precursors* of a changeset may be unknown locally. |
44 This is why we usually focus on the **first known precursors** of the rewritten | 44 This is why we usually focus on the **first known precursors** of the rewritten |
45 changeset. The same apply for *successors*. | 45 changeset. The same apply for *successors*. |
46 | 46 |
47 Changeset in *any successors* which are not **Obsolete** are called | 47 Changeset in *any successors* which are not **obsolete** are called |
48 **newest successors**.. | 48 **newest successors**.. |
49 | 49 |
50 .. note:: I'm not very happy with this naming scheme and I'm looking for a | 50 .. note:: I'm not very happy with this naming scheme and I'm looking for a |
51 better distinction between *direct successors* and **any successors*. | 51 better distinction between *direct successors* and **any successors*. |
52 | 52 |
109 | | troubled) | *latecomer* is a changeset | | 109 | | troubled) | *latecomer* is a changeset | |
110 | | | that tries to be successor | | 110 | | | that tries to be successor | |
111 | | | of public changesets. | | 111 | | | of public changesets. | |
112 | | | | | 112 | | | | |
113 | | | Public changeset can't | | 113 | | | Public changeset can't | |
114 | | | be deleted and replace |. *latecomer* | | 114 | | | be deleted and replace | |
115 | | | *latecomer* | | 115 | | | *latecomer* | |
116 | | | need to be converted into | | 116 | | | need to be converted into | |
117 | | | an overlay to this public | | 117 | | | an overlay to this public | |
118 | | | changeset. | | 118 | | | changeset. | |
119 | | | | | 119 | | | | |