Mercurial > evolve
comparison docs/evolve-faq.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 |
comparison
equal
deleted
inserted
replaced
4615:8406d9b06130 | 4616:a78310b900e3 |
---|---|
138 You can still use rebase to move a whole segment of the changeset graph together. | 138 You can still use rebase to move a whole segment of the changeset graph together. |
139 | 139 |
140 .. warning:: Beware that rebasing changesets already obsolete will likely result in | 140 .. warning:: Beware that rebasing changesets already obsolete will likely result in |
141 divergent versions of the changesets. | 141 divergent versions of the changesets. |
142 | 142 |
143 Resolve history troubles: ``evolve`` | 143 Resolve history instability: ``evolve`` |
144 ------------------------------------ | 144 --------------------------------------- |
145 | 145 |
146 When you rewrite (amend) a changeset with children without rewriting | 146 When you rewrite (amend) a changeset with children without rewriting |
147 those children you create *unstable* changesets and *suspended | 147 those children you create *unstable* changesets and *suspended |
148 obsolete* changesets. | 148 obsolete* changesets. |
149 | 149 |