Mercurial > evolve

comparison docs/obs-terms.rst @ 493:9a4867b79f6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: some terms update
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Fri, 24 Aug 2012 11:21:09 +0200
parents 7ecd41520dae
children e462b3bd3e82
comparison
equal deleted inserted replaced
492:7ecd41520dae 493:9a4867b79f6c
87 | | | they will refuse to be | 87 | | | they will refuse to be |
88 | | | pushed without --force. | 88 | | | pushed without --force. |
89 | | | | 89 | | | |
90 | +--------------------------+-----------------------------+ 90 | +--------------------------+-----------------------------+
91 | | | | 91 | | | |
92 | | **troublesome** | **unstable** | 92 | | **troubled** | **unstable** |
93 | | | | 93 | | | |
94 | | *troublesome* has | *unstable* is a changeset | 94 | | *troubled* has | *unstable* is a changeset |
95 | | unresolved issue caused | with obsolete ancestors. | 95 | | unresolved issue caused | with obsolete ancestors. |
96 | | by *obsolete* relations. | | 96 | | by *obsolete* relations. | |
97 | | | | 97 | | | |
98 | | Possible issues are | It must be rebased on a | 98 | | Possible issues are | It must be rebased on a |
99 | | listed in the next | non *troublesome* base to | 99 | | listed in the next | non *troubled* base to |
100 | | column. It is possible | solve the problem. | 100 | | column. It is possible | solve the problem. |
101 | | for *troublesome* | | 101 | | for *troubled* | |
102 | | changeset to combine | (possible alternative name: | 102 | | changeset to combine | (possible alternative name: |
103 | | multiple issue at once. | precarious) | 103 | | multiple issue at once. | precarious) |
104 | | (a.k.a. conflicting and | | 104 | | (a.k.a. conflicting and | |
105 | | unstable) +-----------------------------+ 105 | | unstable) +-----------------------------+
106 | | | | 106 | | | |
107 | | (possible alternative | **latecomer** | 107 | | (possible alternative | **latecomer** |
108 | | names: unsettled, | | 108 | | names: unsettled, | |
109 | | troubled) | *latecomer* is a changeset | 109 | | troublesome | *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 | 114 | | | be deleted and replace |
139 | | | | 139 | | | |
140 | | | (*splitting* is | 140 | | | (*splitting* is |
141 | | | properly not detected as a | 141 | | | properly not detected as a |
142 | | | conflict) | 142 | | | conflict) |
143 | | | | 143 | | | |
144 | | | (possible alternative names:|
145 | | | clashing, rival) |
146 | | | |
144 | +--------------------------+-----------------------------+ 147 | +--------------------------+-----------------------------+
145 | | | 148 | | |
146 | | Mutable changesets which are neither *obsolete* or | 149 | | Mutable changesets which are neither *obsolete* or |
147 | | *troublesome* are *"ok"*. | 150 | | *troubled* are *"ok"*. |
148 | | | 151 | | |
149 | | Do we really need a name for it ? *"ok"* is a pretty | 152 | | Do we really need a name for it ? *"ok"* is a pretty |
150 | | crappy name :-/ other possibilities are: | 153 | | crappy name :-/ other possibilities are: |
151 | | | 154 | | |
152 | | - stable (confusing with stable branch) | 155 | | - stable (confusing with stable branch) |
174 177
175 .. note:: I'm not very happy with the naming of: 178 .. note:: I'm not very happy with the naming of:
176 179
177 - "ok" changeset 180 - "ok" changeset
178 - latecomer 181 - latecomer
179 - troublesome 182 - conflicting
180 183
181 Any better idea are welcome. 184 Any better idea are welcome.
182 185
183 186
184 Command and operation name 187 Command and operation name