Mercurial > evolve
changeset 4620:a05bfdf372fb
docs: change `divergent` references to `content-divergent`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 27 Apr 2019 21:41:04 -0400 |
| parents | 93514c421528 |
| children | 8784dfc6537c |
| 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, 46 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/concepts.rst Sat Apr 27 21:27:54 2019 -0400 +++ b/docs/concepts.rst Sat Apr 27 21:41:04 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, divergent) ------------------------------------------------ +Unstable changesets (orphan, bumped, 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 @@ -129,17 +129,17 @@ 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 *divergent* (unless one of them is in -public phase; only mutable changesets are divergent). +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 divergent changeset is +The collective term for orphan, bumped, and content-divergent changeset is *unstable*:: - unstable = orphan ∪ bumped ∪ divergent + unstable = orphan ∪ bumped ∪ 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 divergent, or bumped and -divergent, or whatever. +at the same time: it might be an orphan and content-divergent, or bumped and +content-divergent, or whatever. [diagram: Venn diagram of unstable changesets, showing overlap]
--- a/docs/evolve-faq.rst Sat Apr 27 21:27:54 2019 -0400 +++ b/docs/evolve-faq.rst Sat Apr 27 21:41:04 2019 -0400 @@ -138,7 +138,7 @@ You can still use rebase to move a whole segment of the changeset graph together. .. warning:: Beware that rebasing changesets already obsolete will likely result in - divergent versions of the changesets. + content-divergent versions of the changesets. Resolve history instability: ``evolve`` --------------------------------------- @@ -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 `divergent` changeset/ +You can also use evolve to solve `bumped` and `content-divergent` changeset/ Fix my history afterward: ``prune -n``
--- a/docs/obs-terms.rst Sat Apr 27 21:27:54 2019 -0400 +++ b/docs/obs-terms.rst Sat Apr 27 21:41:04 2019 -0400 @@ -104,8 +104,8 @@ | | for *unstable* | | | | changeset to combine | (possible alternative name: | | | multiple issue at once. | precarious) | -| | (a.k.a. divergent and | | -| | orphan) +-----------------------------+ +| | (a.k.a. content-divergent| | +| | and orphan) +-----------------------------+ | | | | | | (possible alternative | **bumped** | | | names: unsettled, | | @@ -125,17 +125,18 @@ | | | mindless, disenchanting) | | | | | | | +-----------------------------+ -| | | **divergent** | +| | | **content-divergent** | | | | | -| | | *divergent* is changeset | -| | | that appears when multiple | -| | | changesets are successors | -| | | of the same predecessor. | +| | | *content-divergent* is a | +| | | changeset that appears when | +| | | multiple changesets are | +| | | successors of the same | +| | | predecessor. | | | | | -| | | *divergent* are solved | -| | | through a three ways merge | -| | | between the two | -| | | *divergent* , | +| | | *content-divergent* are | +| | | solved through a three way | +| | | merge between the two | +| | | *content-divergent* , | | | | using the last "obsolete- | | | | -common-ancestor" as the | | | | base. | @@ -226,7 +227,7 @@ `````` Automatically resolve *troublesome* changesets -(*orphan*, *bumped* and *divergent*) +(*orphan*, *bumped* 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:27:54 2019 -0400 +++ b/docs/sharing.rst Sat Apr 27 21:41:04 2019 -0400 @@ -512,7 +512,7 @@ the most common type of unstable changeset. (Recall that a non-obsolete changeset with obsolete ancestors is an orphan.) -Two other types of instability can happen: *divergent* and +Two other types of instability can happen: *content-divergent* and *bumped* changesets. Both are more likely with shared mutable history, especially mutable history shared by multiple developers. @@ -556,11 +556,11 @@ and add the same text. -Example 6: Divergent changesets -=============================== +Example 6: Content-divergent changesets +======================================= When an obsolete changeset has two successors, those successors are -*divergent*. One way to get into such a situation is by failing +*content-divergent*. One way to get into such a situation is by failing to communicate with your teammates. Let's see how that might happen. First, we'll have Bob commit a bug fix that could still be improved:: @@ -596,11 +596,11 @@ [...] added 1 changesets with 1 changes to 2 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) - 2 new divergent changesets + 2 new content-divergent changesets Figure 9 shows the situation in Bob's repository. - [figure SG09: Bob's repo with 2 heads for the 2 divergent changesets, 6:a360 and 7:e3f9; wc is at 6:a360; both are successors of obsolete 4:2fe6, hence divergence] + [figure SG09: Bob's repo with 2 heads for the 2 content-divergent changesets, 6:a360 and 7:e3f9; wc is at 6:a360; both are successors of obsolete 4:2fe6, hence divergence] Now we need to get out of trouble. As usual, the answer is to evolve history. :: @@ -619,7 +619,7 @@ (``internal:other``) that will take Alice's changes over Bob's. (You might wonder why Bob wouldn't prefer his own changes by using ``internal:local``. He's avoiding a `bug`_ in ``evolve`` that occurs -when evolving divergent changesets using ``internal:local``.) +when evolving content-divergent changesets using ``internal:local``.) # XXX this link does not work .. _`bug`: https://bitbucket.org/marmoute/mutable-history/issue/48/
--- a/docs/tutorial/draft.md Sat Apr 27 21:27:54 2019 -0400 +++ b/docs/tutorial/draft.md Sat Apr 27 21:41:04 2019 -0400 @@ -552,7 +552,7 @@ ## Bumped -## Divergent +## Content-divergent ~~~graphviz digraph G { @@ -561,17 +561,17 @@ node[fixedsize=true, style="filled", width=1, height=1, fillcolor="#7F7FFF", shape="pentagon"]; Root -> Base; - Root -> Divergent1; - Root -> Divergent2; + Root -> Content-divergent1; + Root -> Content-divergent2; // Obsolescence links edge[dir=back, style=dotted, arrowtail=dot]; - Base -> Divergent1; - Base -> Divergent2; + Base -> Content-divergent1; + Base -> Content-divergent2; Base [shape="pentagon", fillcolor="#DFDFFF"]; - Divergent1 [fillcolor="#FF3535"]; - Divergent2 [fillcolor="#FF3535"]; + Content-divergent1 [fillcolor="#FF3535"]; + Content-divergent2 [fillcolor="#FF3535"]; Root[shape="circle"]; } ~~~
--- a/docs/tutorial/slides.md Sat Apr 27 21:27:54 2019 -0400 +++ b/docs/tutorial/slides.md Sat Apr 27 21:41:04 2019 -0400 @@ -2170,7 +2170,7 @@ } ~~~ -#### Divergent +#### Content-divergent Now called `Content-divergent` @@ -2181,17 +2181,17 @@ node[fixedsize=true, style="filled", width=1, height=1, fillcolor="#7F7FFF", shape="pentagon"]; Root -> Base; - Root -> Divergent1; - Root -> Divergent2; + Root -> Content-divergent1; + Root -> Content-divergent2; // Obsolescence links edge[dir=back, style=dotted, arrowtail=dot]; - Base -> Divergent1; - Base -> Divergent2; + Base -> Content-divergent1; + Base -> Content-divergent2; Base [shape="pentagon", fillcolor="#DFDFFF"]; - Divergent1 [fillcolor="#FF3535"]; - Divergent2 [fillcolor="#FF3535"]; + Content-divergent1 [fillcolor="#FF3535"]; + Content-divergent2 [fillcolor="#FF3535"]; Root[shape="circle"]; } ~~~
--- a/docs/user-guide.rst Sat Apr 27 21:27:54 2019 -0400 +++ b/docs/user-guide.rst Sat Apr 27 21:41:04 2019 -0400 @@ -356,7 +356,7 @@ a consistent way for you to get back to a stable repository. (Incidentally, there are two other types of instability that changesets -can get into with ``evolve``: they may be *divergent* or +can get into with ``evolve``: they may be *content-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.) @@ -594,7 +594,7 @@ change in the future. Consider the history in Figure 12, where revision 27 is obsolete and the child of 26, also obsolete. If we ``hg touch 27``, that creates a new revision which is a non-obsolete child of 26—i.e., it is an -orphan. It's also *divergent*, another type of trouble that we'll learn +orphan. It's also *content-divergent*, another type of trouble that we'll learn about in the `next section`_. .. _`next section`: sharing.html