Mercurial > evolve
diff docs/obs-terms.rst @ 4621:8784dfc6537c
docs: change `bumped` references to `phase-divergent`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 27 Apr 2019 21:54:52 -0400 |
| parents | a05bfdf372fb |
| children |
line wrap: on
line diff
--- a/docs/obs-terms.rst Sat Apr 27 21:41:04 2019 -0400 +++ b/docs/obs-terms.rst Sat Apr 27 21:54:52 2019 -0400 @@ -107,15 +107,16 @@ | | (a.k.a. content-divergent| | | | and orphan) +-----------------------------+ | | | | -| | (possible alternative | **bumped** | +| | (possible alternative | **phase-divergent** | | | names: unsettled, | | -| | troublesome | *bumped* is a changeset | -| | | that tries to be successor | -| | | of public changesets. | +| | troublesome | *phase-divergent* is a | +| | | changeset that tries to be | +| | | successor of a public | +| | | changeset. | | | | | | | | Public changeset can't | | | | be deleted and replace | -| | | *bumped* | +| | | *phase-divergent* | | | | need to be converted into | | | | an overlay to this public | | | | changeset. | @@ -227,7 +228,7 @@ `````` Automatically resolve *troublesome* changesets -(*orphan*, *bumped* and *content-divergent*) +(*orphan*, *phase-divergent* and *content-divergent*) This is an important name as hg pull/push will suggest it the same way it suggest merging when you add heads.