Mercurial > evolve
changeset 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 | 2cab06f5c4d4 |
| files | docs/evolve-faq.rst docs/sharing.rst docs/tutorial/slides.md docs/tutorial/test-training.t docs/user-guide.rst |
| diffstat | 5 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/evolve-faq.rst Sat Apr 27 19:32:03 2019 -0400 +++ b/docs/evolve-faq.rst Sat Apr 27 19:42:42 2019 -0400 @@ -140,8 +140,8 @@ .. warning:: Beware that rebasing changesets already obsolete will likely result in divergent versions of the changesets. -Resolve history troubles: ``evolve`` ------------------------------------- +Resolve history instability: ``evolve`` +--------------------------------------- When you rewrite (amend) a changeset with children without rewriting those children you create *unstable* changesets and *suspended
--- a/docs/sharing.rst Sat Apr 27 19:32:03 2019 -0400 +++ b/docs/sharing.rst Sat Apr 27 19:42:42 2019 -0400 @@ -512,7 +512,7 @@ the most common type of troubled changeset. (Recall that a non-obsolete changeset with obsolete ancestors is an orphan.) -Two other types of troubles can happen: *divergent* and +Two other types of instability can happen: *divergent* and *bumped* changesets. Both are more likely with shared mutable history, especially mutable history shared by multiple developers.
--- a/docs/tutorial/slides.md Sat Apr 27 19:32:03 2019 -0400 +++ b/docs/tutorial/slides.md Sat Apr 27 19:42:42 2019 -0400 @@ -1130,9 +1130,9 @@ À deux: -- troubles, divergence, orphan -- troubles visualization -- troubles resolution +- instability, divergence, orphan +- instability visualization +- instability resolution - collaboration workflow Parler du happy path d'abord --> @@ -2025,7 +2025,7 @@ </table> -## Troubles +## Instability #### Evolution @@ -2041,7 +2041,7 @@ #### instability -(currently: *troubles*) +(currently: *instability*) * **Orphans:** ancestors were rewritten @@ -2091,7 +2091,7 @@ <img src="https://media.giphy.com/media/46vrhWWOJ4wHC/giphy.gif"> -## extra - Troubles +## extra - Instability #### Obsolete
--- a/docs/tutorial/test-training.t Sat Apr 27 19:32:03 2019 -0400 +++ b/docs/tutorial/test-training.t Sat Apr 27 19:42:42 2019 -0400 @@ -2550,7 +2550,7 @@ 19 -> 20 [penwidth=2.0]; } -Basic troubles + stabilization +Basic instability + stabilization ------------------------------ $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/edit-mid-stack/
--- 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.)