diff docs/concepts.rst @ 4621:8784dfc6537c

docs: change `bumped` references to `phase-divergent`

Per https://www.mercurial-scm.org/wiki/CEDVocabulary

--- 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]