comparison docs/user-guide.rst @ 4616:a78310b900e3

docs: change `troubles` references to `instability`

Per https://www.mercurial-scm.org/wiki/CEDVocabulary.  There are a couple
instances of 'troublesome' which probably need a word, as deriviatives of
'instability' didn't really fit.  At least some of these are in the unlinked
obs-terms.rst page.

4615:8406d9b06130

Now that you've got a solid understanding of how ``evolve`` works in
concert with changeset obsolescence, let's explore some more advanced
scenarios. All of these scenarios will involve *unstable* changesets,
which is an unavoidable consequence of obsolescence. What really sets
``evolve`` apart from other history modification mechanisms is the
fact that it recognizes troubles like unstable changesets and provides
a consistent way for you to get back to a stable repository.

(Incidentally, there are two other types of troubles that changesets
can get into with ``evolve``: they may be *divergent* or
*bumped*. Both of those states are more likely to occur when
`sharing mutable history`_, so we won't cover them in this user guide.)

.. _`sharing mutable history`: sharing.html

4616:a78310b900e3

Now that you've got a solid understanding of how ``evolve`` works in
concert with changeset obsolescence, let's explore some more advanced
scenarios. All of these scenarios will involve *unstable* changesets,
which is an unavoidable consequence of obsolescence. What really sets
``evolve`` apart from other history modification mechanisms is the
fact that it recognizes instability like unstable changesets and provides
a consistent way for you to get back to a stable repository.

(Incidentally, there are two other types of instability that changesets
can get into with ``evolve``: they may be *divergent* or
*bumped*. Both of those states are more likely to occur when
`sharing mutable history`_, so we won't cover them in this user guide.)

.. _`sharing mutable history`: sharing.html