Mercurial > evolve
changeset 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 | 86f396d2b352 |
| files | docs/concepts.rst docs/evolve-faq.rst docs/obs-terms.rst docs/sharing.rst docs/tutorial/draft.md docs/tutorial/slides.md docs/user-guide.rst |
| diffstat | 7 files changed, 29 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/concepts.rst Sat Apr 27 21:41:04 2019 -0400 +++ b/docs/concepts.rst Sat Apr 27 21:54:52 2019 -0400 @@ -92,8 +92,8 @@ think of the traditional parent/child DAG as the first derivative of your source code, and the obsolescence DAG as the second derivative.) -Unstable changesets (orphan, bumped, content-divergent) -------------------------------------------------------- +Unstable changesets (orphan, phase-divergent, content-divergent) +---------------------------------------------------------------- Evolving history can introduce problems that need to be solved. For example, if you prune a changeset *P* but not its descendants, those @@ -116,7 +116,7 @@ phase and therefore mutable. So Bob amends *C*, which marks it obsolete and replaces it with *C'*. When he is back online and pulls from the public repository, Mercurial learns that *C* is public, which -means it cannot be obsolete. We say that *C'* is *bumped*, since it is +means it cannot be obsolete. We say that *C'* is *phase-divergent*, since it is the successor of a public changeset. .. _`share mutable history`: sharing.html @@ -125,21 +125,21 @@ two people have bought tickets for the same seat on a plane and they both show up at the airport, only one of them gets on the plane. The passenger who is left behind in the airport terminal has been -"bumped".) +"phase-divergent".) The third sort of trouble is when Alice and Bob both amend the same changeset *C* to have different successors. When this happens, the successors are both called *content-divergent* (unless one of them is in public phase; only mutable changesets are content-divergent). -The collective term for orphan, bumped, and content-divergent changeset is -*unstable*:: +The collective term for orphan, phase-divergent, and content-divergent +changeset is *unstable*:: - unstable = orphan ∪ bumped ∪ content-divergent + unstable = orphan ∪ phase-divergent ∪ content-divergent It is possible for a changeset to be in any of the unstable categories -at the same time: it might be an orphan and content-divergent, or bumped and -content-divergent, or whatever. +at the same time: it might be an orphan and content-divergent, or +phase-divergent and content-divergent, or whatever. [diagram: Venn diagram of unstable changesets, showing overlap]
--- a/docs/evolve-faq.rst Sat Apr 27 21:41:04 2019 -0400 +++ b/docs/evolve-faq.rst Sat Apr 27 21:54:52 2019 -0400 @@ -151,7 +151,7 @@ declare it stable, in other words rebase its former descendants on its newest version. -You can also use evolve to solve `bumped` and `content-divergent` changeset/ +You can also use evolve to solve `phase-divergent` and `content-divergent` changeset/ Fix my history afterward: ``prune -n``
--- 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.
--- a/docs/sharing.rst Sat Apr 27 21:41:04 2019 -0400 +++ b/docs/sharing.rst Sat Apr 27 21:54:52 2019 -0400 @@ -513,7 +513,7 @@ non-obsolete changeset with obsolete ancestors is an orphan.) Two other types of instability can happen: *content-divergent* and -*bumped* changesets. Both are more likely with shared mutable +*phase-divergent* changesets. Both are more likely with shared mutable history, especially mutable history shared by multiple developers. Setting up @@ -686,16 +686,16 @@ obsolete, it made perfect sense for it to have a successor, namely Bob's amendment of Alice's fix (changeset 4:fe88). But it's illogical for a public changeset to have a successor, so 4:fe88 is unstable: -it has become *bumped*. +it has become *phase-divergent*. - [figure SG07: 2:e011 now public not obsolete, 4:fe88 now bumped] + [figure SG07: 2:e011 now public not obsolete, 4:fe88 now phase-divergent] As usual when there's trouble in your repository, the solution is to evolve it:: $ hg evolve --all -Figure 8 illustrates Bob's repository after evolving away the bumped +Figure 8 illustrates Bob's repository after evolving away the phase-divergent changeset. Ignoring the obsolete changesets, Bob now has a nice, clean, simple history. His amendment of Alice's bug fix lives on, as changeset 5:227d—albeit with a software-generated commit message. (Bob @@ -703,7 +703,7 @@ But the important thing is that his repository no longer has any unstable changesets, thanks to ``evolve``. - [figure SG08: 5:227d is new, formerly bumped changeset 4:fe88 now hidden] + [figure SG08: 5:227d is new, formerly phase-divergent changeset 4:fe88 now hidden] Conclusion ----------
--- a/docs/tutorial/draft.md Sat Apr 27 21:41:04 2019 -0400 +++ b/docs/tutorial/draft.md Sat Apr 27 21:54:52 2019 -0400 @@ -550,7 +550,7 @@ } ~~~ -## Bumped +## Phase-divergent ## Content-divergent
--- a/docs/tutorial/slides.md Sat Apr 27 21:41:04 2019 -0400 +++ b/docs/tutorial/slides.md Sat Apr 27 21:54:52 2019 -0400 @@ -2141,7 +2141,7 @@ } ~~~ -#### Bumped +#### Phase-divergent Now called `Phase-divergent` @@ -2155,17 +2155,17 @@ Root -> New; node[group=obsolete]; Root -> Obsolete; - node[group=bumped]; - Root -> Bumped; + node[group=phase-divergent]; + Root -> Phase-divergent; // Obsolescence links edge[dir=back, style=dotted, arrowtail=dot]; Obsolete -> New; - Obsolete -> Bumped; + Obsolete -> Phase-divergent; New [shape="circle"]; Obsolete [fillcolor="#DFDFFF"]; - Bumped [fillcolor="#FF3535"]; + Phase-divergent [fillcolor="#FF3535"]; Root[shape="circle"]; } ~~~
--- a/docs/user-guide.rst Sat Apr 27 21:41:04 2019 -0400 +++ b/docs/user-guide.rst Sat Apr 27 21:54:52 2019 -0400 @@ -357,7 +357,7 @@ (Incidentally, there are two other types of instability that changesets can get into with ``evolve``: they may be *content-divergent* or -*bumped*. Both of those states are more likely to occur when +*phase-divergent*. 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