Mercurial > evolve
comparison docs/obs-terms.rst @ 575:36de5e30d3eb stable
doc: rename conflicting to divergent.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Thu, 27 Sep 2012 16:40:25 +0200 |
| parents | b81193ef3488 |
| children | 26f76b38f879 |
comparison
equal
deleted
inserted
replaced
| 574:4f5562c92630 | 575:36de5e30d3eb |
|---|---|
| 102 | | listed in the next | non *troubled* base to | | 102 | | listed in the next | non *troubled* base to | |
| 103 | | column. It is possible | solve the problem. | | 103 | | column. It is possible | solve the problem. | |
| 104 | | for *troubled* | | | 104 | | for *troubled* | | |
| 105 | | changeset to combine | (possible alternative name: | | 105 | | changeset to combine | (possible alternative name: | |
| 106 | | multiple issue at once. | precarious) | | 106 | | multiple issue at once. | precarious) | |
| 107 | | (a.k.a. conflicting and | | | 107 | | (a.k.a. divergent and | | |
| 108 | | unstable) +-----------------------------+ | 108 | | unstable) +-----------------------------+ |
| 109 | | | | | 109 | | | | |
| 110 | | (possible alternative | **latecomer** | | 110 | | (possible alternative | **latecomer** | |
| 111 | | names: unsettled, | | | 111 | | names: unsettled, | | |
| 112 | | troublesome | *latecomer* is a changeset | | 112 | | troublesome | *latecomer* is a changeset | |
| 123 | | | (possible alternative names:| | 123 | | | (possible alternative names:| |
| 124 | | | mislead, naive, unaware, | | 124 | | | mislead, naive, unaware, | |
| 125 | | | mindless, disenchanting) | | 125 | | | mindless, disenchanting) | |
| 126 | | | | | 126 | | | | |
| 127 | | +-----------------------------+ | 127 | | +-----------------------------+ |
| 128 | | | **conflicting** | | 128 | | | **divergent** | |
| 129 | | | | | 129 | | | | |
| 130 | | | *conflicting* is changeset | | 130 | | | *divergent* is changeset | |
| 131 | | | that appears when multiple | | 131 | | | that appears when multiple | |
| 132 | | | changesets are successors | | 132 | | | changesets are successors | |
| 133 | | | of the same precursor. | | 133 | | | of the same precursor. | |
| 134 | | | | | 134 | | | | |
| 135 | | | *conflicting* are solved | | 135 | | | *divergent* are solved | |
| 136 | | | through a three ways merge | | 136 | | | through a three ways merge | |
| 137 | | | between the two | | 137 | | | between the two | |
| 138 | | | *conflictings*, | | 138 | | | *divergent* , | |
| 139 | | | using the last "obsolete- | | 139 | | | using the last "obsolete- | |
| 140 | | | -common-ancestor" as the | | 140 | | | -common-ancestor" as the | |
| 141 | | | base. | | 141 | | | base. | |
| 142 | | | | | 142 | | | | |
| 143 | | | (*splitting* is | | 143 | | | (*splitting* is | |
| 144 | | | properly not detected as a | | 144 | | | properly not detected as a | |
| 145 | | | conflict) | | 145 | | | conflict) | |
| 146 | | | | | 146 | | | | |
| 147 | | | (possible alternative names:| | 147 | | | (possible alternative names:| |
| 148 | | | clashing, rival) | | 148 | | | clashing, rival, concurent, | |
| 149 | | | conflicting) | | |
| 149 | | | | | 150 | | | | |
| 150 | +--------------------------+-----------------------------+ | 151 | +--------------------------+-----------------------------+ |
| 151 | | | | 152 | | | |
| 152 | | Mutable changesets which are neither *obsolete* or | | 153 | | Mutable changesets which are neither *obsolete* or | |
| 153 | | *troubled* are *"ok"*. | | 154 | | *troubled* are *"ok"*. | |
| 180 | 181 |
| 181 .. note:: I'm not very happy with the naming of: | 182 .. note:: I'm not very happy with the naming of: |
| 182 | 183 |
| 183 - "ok" changeset | 184 - "ok" changeset |
| 184 - latecomer | 185 - latecomer |
| 185 - conflicting | 186 - divergent |
| 186 | 187 |
| 187 Any better idea are welcome. | 188 Any better idea are welcome. |
| 188 | 189 |
| 189 | 190 |
| 190 Command and operation name | 191 Command and operation name |
| 230 | 231 |
| 231 evolve | 232 evolve |
| 232 ``````````````` | 233 ``````````````` |
| 233 | 234 |
| 234 Automatically resolve *troublesome* changesets | 235 Automatically resolve *troublesome* changesets |
| 235 (*unstable*, *latecomer* and *conflicting*) | 236 (*unstable*, *latecomer* and *divergent*) |
| 236 | 237 |
| 237 This is an important name as hg pull/push will suggest it the same way it | 238 This is an important name as hg pull/push will suggest it the same way it |
| 238 suggest merging when you add heads. | 239 suggest merging when you add heads. |
| 239 | 240 |
| 240 alternative names: | 241 alternative names: |