[PATCH 06 of 14 evolve-ext] docs: change `troubled` references to `unstable`

Matt Harbison mharbison72 at gmail.com
Sun Apr 28 00:28:53 EDT 2019


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1556414874 14400
#      Sat Apr 27 21:27:54 2019 -0400
# Node ID 62818a50aa85028e6a938eee4565d94277614f71
# Parent  7bc1b790f02fff5e7fc0aa6baefa17b61fbe183c
docs: change `troubled` references to `unstable`

Per https://www.mercurial-scm.org/wiki/CEDVocabulary

diff --git a/docs/concepts.rst b/docs/concepts.rst
--- a/docs/concepts.rst
+++ b/docs/concepts.rst
@@ -92,7 +92,7 @@
 think of the traditional parent/child DAG as the first derivative of
 your source code, and the obsolescence DAG as the second derivative.)
 
-Troubled changesets (orphan, bumped, divergent)
+Unstable changesets (orphan, bumped, divergent)
 -----------------------------------------------
 
 Evolving history can introduce problems that need to be solved. For
@@ -133,17 +133,17 @@
 public phase; only mutable changesets are divergent).
 
 The collective term for orphan, bumped, and divergent changeset is
-*troubled*::
+*unstable*::
 
-  troubled = orphan ∪ bumped ∪ divergent
+  unstable = orphan ∪ bumped ∪ divergent
 
-It is possible for a changeset to be in any of the troubled categories
+It is possible for a changeset to be in any of the unstable categories
 at the same time: it might be an orphan and divergent, or bumped and
 divergent, or whatever.
 
-  [diagram: Venn diagram of troubled changesets, showing overlap]
+  [diagram: Venn diagram of unstable changesets, showing overlap]
 
-The presence of troubled changesets indicates the need to run ``hg
+The presence of unstable changesets indicates the need to run ``hg
 evolve``.
 
 Hidden (and visible) changesets
@@ -192,7 +192,7 @@
   hidden = hideable ∖ ancestors((repo ∖ hideable) ∪ blockers)
 
 This will probably be clearer with a worked example. First, here's a
-repository with some obsolete changesets, some troubled changesets,
+repository with some obsolete changesets, some unstable changesets,
 one bookmark, a working copy, and some hidden changesets::
 
         x-x
diff --git a/docs/obs-terms.rst b/docs/obs-terms.rst
--- a/docs/obs-terms.rst
+++ b/docs/obs-terms.rst
@@ -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:               |
diff --git a/docs/sharing.rst b/docs/sharing.rst
--- a/docs/sharing.rst
+++ b/docs/sharing.rst
@@ -509,7 +509,7 @@
 with a spoon?)
 
 In the user guide, we saw examples of *orphan* changesets, which are
-the most common type of troubled changeset. (Recall that a
+the most common type of unstable changeset. (Recall that a
 non-obsolete changeset with obsolete ancestors is an orphan.)
 
 Two other types of instability can happen: *divergent* and
@@ -685,7 +685,7 @@
 2:e011 is now public, so it can't be obsolete. When that changeset was
 obsolete, it made perfect sense for it to have a successor, namely
 Bob's amendment of Alice's fix (changeset 4:fe88). But it's illogical
-for a public changeset to have a successor, so 4:fe88 is troubled:
+for a public changeset to have a successor, so 4:fe88 is unstable:
 it has become *bumped*.
 
   [figure SG07: 2:e011 now public not obsolete, 4:fe88 now bumped]
@@ -701,7 +701,7 @@
 changeset 5:227d—albeit with a software-generated commit message. (Bob
 should probably amend that changeset to improve the commit message.)
 But the important thing is that his repository no longer has any
-troubled changesets, thanks to ``evolve``.
+unstable changesets, thanks to ``evolve``.
 
   [figure SG08: 5:227d is new, formerly bumped changeset 4:fe88 now hidden]
 
@@ -713,7 +713,7 @@
 dull knife (never mind a rusty spoon). At the same time, an
 inattentive or careless user can do harm to himself or others.
 Mercurial with ``evolve`` goes to great lengths to limit the harm you
-can do by trying to handle all possible types of “troubled”
+can do by trying to handle all possible types of “unstable”
 changesets. Nevertheless, having a first-aid kit nearby does not mean
 you should stop being careful with sharp knives.
 
diff --git a/docs/tutorial/slides.md b/docs/tutorial/slides.md
--- a/docs/tutorial/slides.md
+++ b/docs/tutorial/slides.md
@@ -1908,7 +1908,7 @@
    split                  (on branch: default, 1 changesets, <span style="color:teal;">492 behind</span>)
    stack_orphan_bug     (on branch: default, 1 changesets, <span style="color:teal;">474 behind</span>)
    tutorial               (on branch: default, 2 changesets, <span style="color:teal;">492 behind</span>)
-<span style="color:green;"> * </span><span style="color:green;">tutorialtypos         </span> (on branch: default, 3 changesets, <span style="color:red;">1 troubled</span>, <span style="color:olive;">2 heads</span>, <span style="color:teal;">2 behind</span>)
+<span style="color:green;"> * </span><span style="color:green;">tutorialtypos         </span> (on branch: default, 3 changesets, <span style="color:red;">1 unstable</span>, <span style="color:olive;">2 heads</span>, <span style="color:teal;">2 behind</span>)
 </pre>
 
 #### Log


More information about the Mercurial-devel mailing list