Mercurial > public > mercurial-scm > evolve

comparison docs/tutorial/slides.md @ 4620:a05bfdf372fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4619:93514c421528 4620:a05bfdf372fb
2168 Bumped [fillcolor="#FF3535"]; 2168 Bumped [fillcolor="#FF3535"];
2169 Root[shape="circle"]; 2169 Root[shape="circle"];
2170 } 2170 }
2171 ~~~ 2171 ~~~
2172 2172
2173 #### Divergent 2173 #### Content-divergent
2174 2174
2175 Now called `Content-divergent` 2175 Now called `Content-divergent`
2176 2176
2177 ~~~graphviz 2177 ~~~graphviz
2178 digraph G { 2178 digraph G {
2179 rankdir="BT"; 2179 rankdir="BT";
2180 graph[splines=polyline]; 2180 graph[splines=polyline];
2181 node[fixedsize=true, style="filled", width=1, height=1, fillcolor="#7F7FFF", shape="pentagon"]; 2181 node[fixedsize=true, style="filled", width=1, height=1, fillcolor="#7F7FFF", shape="pentagon"];
2182 2182
2183 Root -> Base; 2183 Root -> Base;
2184 Root -> Divergent1; 2184 Root -> Content-divergent1;
2185 Root -> Divergent2; 2185 Root -> Content-divergent2;
2186 2186
2187 // Obsolescence links 2187 // Obsolescence links
2188 edge[dir=back, style=dotted, arrowtail=dot]; 2188 edge[dir=back, style=dotted, arrowtail=dot];
2189 Base -> Divergent1; 2189 Base -> Content-divergent1;
2190 Base -> Divergent2; 2190 Base -> Content-divergent2;
2191 2191
2192 Base [shape="pentagon", fillcolor="#DFDFFF"]; 2192 Base [shape="pentagon", fillcolor="#DFDFFF"];
2193 Divergent1 [fillcolor="#FF3535"]; 2193 Content-divergent1 [fillcolor="#FF3535"];
2194 Divergent2 [fillcolor="#FF3535"]; 2194 Content-divergent2 [fillcolor="#FF3535"];
2195 Root[shape="circle"]; 2195 Root[shape="circle"];
2196 } 2196 }
2197 ~~~ 2197 ~~~
2198 2198
2199 ## extra-commands 2199 ## extra-commands