Mercurial > evolve
changeset 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 | 4f5562c92630 |
| children | cf116ffc9cc5 |
| files | docs/obs-terms.rst |
| diffstat | 1 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/obs-terms.rst Tue Sep 25 12:06:48 2012 +0200 +++ b/docs/obs-terms.rst Thu Sep 27 16:40:25 2012 +0200 @@ -104,7 +104,7 @@ | | for *troubled* | | | | changeset to combine | (possible alternative name: | | | multiple issue at once. | precarious) | -| | (a.k.a. conflicting and | | +| | (a.k.a. divergent and | | | | unstable) +-----------------------------+ | | | | | | (possible alternative | **latecomer** | @@ -125,17 +125,17 @@ | | | mindless, disenchanting) | | | | | | | +-----------------------------+ -| | | **conflicting** | +| | | **divergent** | | | | | -| | | *conflicting* is changeset | +| | | *divergent* is changeset | | | | that appears when multiple | | | | changesets are successors | | | | of the same precursor. | | | | | -| | | *conflicting* are solved | +| | | *divergent* are solved | | | | through a three ways merge | | | | between the two | -| | | *conflictings*, | +| | | *divergent* , | | | | using the last "obsolete- | | | | -common-ancestor" as the | | | | base. | @@ -145,7 +145,8 @@ | | | conflict) | | | | | | | | (possible alternative names:| -| | | clashing, rival) | +| | | clashing, rival, concurent, | +| | | conflicting) | | | | | | +--------------------------+-----------------------------+ | | | @@ -182,7 +183,7 @@ - "ok" changeset - latecomer - - conflicting + - divergent Any better idea are welcome. @@ -232,7 +233,7 @@ ``````````````` Automatically resolve *troublesome* changesets -(*unstable*, *latecomer* and *conflicting*) +(*unstable*, *latecomer* and *divergent*) This is an important name as hg pull/push will suggest it the same way it suggest merging when you add heads.