Mercurial > evolve
diff docs/obs-terms.rst @ 4619:93514c421528
docs: change `troubled` references to `unstable`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 27 Apr 2019 21:27:54 -0400 |
| parents | 803d32f4e498 |
| children | a05bfdf372fb |
line wrap: on
line diff
--- a/docs/obs-terms.rst Sat Apr 27 21:24:18 2019 -0400 +++ b/docs/obs-terms.rst Sat Apr 27 21:27:54 2019 -0400 @@ -92,16 +92,16 @@ | | | | | +--------------------------+-----------------------------+ | | | | -| | **troubled** | **orphan** | +| | **unstable** | **orphan** | | | | | -| | *troubled* has | *orphan* is a changeset | +| | *unstable* has | *orphan* 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 *troubled* base to | +| | listed in the next | non *unstable* base to | | | column. It is possible | solve the problem. | -| | for *troubled* | | +| | for *unstable* | | | | changeset to combine | (possible alternative name: | | | multiple issue at once. | precarious) | | | (a.k.a. divergent and | | @@ -151,7 +151,7 @@ | +--------------------------+-----------------------------+ | | | | | Mutable changesets which are neither *obsolete* or | -| | *troubled* are *"ok"*. | +| | *unstable* are *"ok"*. | | | | | | Do we really need a name for it ? *"ok"* is a pretty | | | crappy name :-/ other possibilities are: |