Mercurial > public > mercurial-scm > evolve

diff docs/tutorial/slides.md @ 4621:8784dfc6537c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 87006dcf2bb7
line wrap: on
line diff
--- 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"];
     }
 ~~~