Mercurial > evolve
diff 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.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 27 Apr 2019 19:42:42 -0400 |
parents | 8406d9b06130 |
children | 803d32f4e498 |
line wrap: on
line diff
--- a/docs/user-guide.rst Sat Apr 27 19:32:03 2019 -0400 +++ b/docs/user-guide.rst Sat Apr 27 19:42:42 2019 -0400 @@ -352,10 +352,10 @@ 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 +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 troubles that changesets +(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.)