Mercurial > evolve
changeset 493:9a4867b79f6c
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 | 80bd1e8f5ae9 |
| files | docs/obs-terms.rst |
| diffstat | 1 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/obs-terms.rst Fri Aug 24 11:17:18 2012 +0200 +++ b/docs/obs-terms.rst Fri Aug 24 11:21:09 2012 +0200 @@ -89,16 +89,16 @@ | | | | | +--------------------------+-----------------------------+ | | | | -| | **troublesome** | **unstable** | +| | **troubled** | **unstable** | | | | | -| | *troublesome* has | *unstable* is a changeset | +| | *troubled* has | *unstable* is a changeset | | | unresolved issue caused | with obsolete ancestors. | | | by *obsolete* relations. | | | | | | | | Possible issues are | It must be rebased on a | -| | listed in the next | non *troublesome* base to | +| | listed in the next | non *troubled* base to | | | column. It is possible | solve the problem. | -| | for *troublesome* | | +| | for *troubled* | | | | changeset to combine | (possible alternative name: | | | multiple issue at once. | precarious) | | | (a.k.a. conflicting and | | @@ -106,7 +106,7 @@ | | | | | | (possible alternative | **latecomer** | | | names: unsettled, | | -| | troubled) | *latecomer* is a changeset | +| | troublesome | *latecomer* is a changeset | | | | that tries to be successor | | | | of public changesets. | | | | | @@ -141,10 +141,13 @@ | | | properly not detected as a | | | | conflict) | | | | | +| | | (possible alternative names:| +| | | clashing, rival) | +| | | | | +--------------------------+-----------------------------+ | | | | | Mutable changesets which are neither *obsolete* or | -| | *troublesome* are *"ok"*. | +| | *troubled* are *"ok"*. | | | | | | Do we really need a name for it ? *"ok"* is a pretty | | | crappy name :-/ other possibilities are: | @@ -176,7 +179,7 @@ - "ok" changeset - latecomer - - troublesome + - conflicting Any better idea are welcome.