Mercurial > evolve
diff docs/sharing.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/sharing.rst Sat Apr 27 21:24:18 2019 -0400 +++ b/docs/sharing.rst Sat Apr 27 21:27:54 2019 -0400 @@ -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.