evolve: comparison docs/obs-terms.rst

equal deleted inserted replaced

-:4f5562c92630
+:36de5e30d3eb
 |                     | listed in the next       | non *troubled*    base to   |
 |                     | column. It is possible   | solve the problem.          |
 |                     | 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**               |
 |                     | names: unsettled,        |                             |
 |                     | troublesome              | *latecomer* is a changeset  |
 |                     |                          | (possible alternative names:|
 |                     |                          | mislead, naive, unaware,    |
 |                     |                          | 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.                       |
 |                     |                          |                             |
 |                     |                          | (*splitting* is             |
 |                     |                          | properly not detected as a  |
 |                     |                          | conflict)                   |
 |                     |                          |                             |
 |                     |                          | (possible alternative names:|
-|                     |                          | clashing, rival)            |
+|                     |                          | clashing, rival, concurent, |
+|                     |                          | conflicting)                |
 |                     |                          |                             |
 |                     +--------------------------+-----------------------------+
 |                     |                                                        |
 |                     | Mutable changesets which are neither *obsolete* or     |
 |                     | *troubled*    are *"ok"*.                              |
 .. note:: I'm not very happy with the naming of:
 - "ok" changeset
 - latecomer
-- conflicting
+- divergent
 Any better idea are welcome.
 Command and operation name
 evolve
 ```````````````
 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.
 alternative names:

branch	stable
changeset 575	36de5e30d3eb
parent 527	b81193ef3488
child 593	26f76b38f879