--- a/docs/figures/figure-ug02.svg Thu Apr 25 15:14:21 2019 -0700
+++ b/docs/figures/figure-ug02.svg Sat Apr 27 14:42:48 2019 -0400
@@ -15,7 +15,7 @@
height="250"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug02.svg">
<defs
id="defs4">
@@ -210,10 +210,10 @@
inkscape:document-units="px"
inkscape:current-layer="svg2"
showgrid="false"
- inkscape:window-width="974"
- inkscape:window-height="1048"
- inkscape:window-x="104"
- inkscape:window-y="103"
+ inkscape:window-width="1032"
+ inkscape:window-height="710"
+ inkscape:window-x="224"
+ inkscape:window-y="33"
inkscape:window-maximized="0"
showguides="false"
inkscape:snap-global="false"
@@ -228,8 +228,10 @@
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
- originx="0.078088198px"
- originy="-2937.8154px" />
+ originx="0.078088198"
+ originy="-2937.8154"
+ spacingx="1"
+ spacingy="1" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -259,13 +261,12 @@
id="rect2987"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217"
y="252.23067"
x="390.00699"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
- style="stroke:none"
+ style="font-size:12px;line-height:1.25;font-family:sans-serif;stroke:none"
y="252.23067"
x="390.00699"
id="tspan5219"
@@ -283,19 +284,19 @@
style="fill:none;stroke:#000000;stroke-width:0.99999791;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8"
y="13.894781"
x="56.792801"
- style="font-size:11.9999752px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
id="tspan6156"
sodipodi:role="line"
x="56.792801"
- y="13.894781">1</tspan></text>
+ y="13.894781"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">1</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:0.99999791px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.99999791px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
d="m 21.981735,10.916236 38.51827,1e-6"
id="path8263"
inkscape:connector-type="polyline"
@@ -315,13 +316,12 @@
id="rect2987-41"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-7"
y="252.23067"
x="390.00699"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
- style="stroke:none"
+ style="font-size:12px;line-height:1.25;font-family:sans-serif;stroke:none"
y="252.23067"
x="390.00699"
id="tspan5219-3"
@@ -339,19 +339,19 @@
style="fill:none;stroke:#000000;stroke-width:0.99999791;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-7"
y="144.84122"
x="67.447083"
- style="font-size:11.9999752px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="144.84122"
x="67.447083"
id="tspan3914"
- sodipodi:role="line">3</tspan></text>
+ sodipodi:role="line"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">3</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-6);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-6)"
d="m 18.903026,154.7407 44.684935,52.70603"
id="path5012"
inkscape:connector-type="polyline"
@@ -365,27 +365,27 @@
transform="translate(1.9995778e-6,23.240701)">
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-0"
y="42.826412"
x="46.543755"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Monospace;-inkscape-font-specification:Monospace"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:monospace;-inkscape-font-specification:Monospace;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="42.826412"
x="46.543755"
id="tspan8594"
- sodipodi:role="line">hg commit --amend</tspan></text>
+ sodipodi:role="line"
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg commit --amend</tspan></text>
<text
- sodipodi:linespacing="125%"
id="text5223"
y="54.872299"
x="46.760452"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="54.872299"
x="46.760452"
id="tspan5227"
- sodipodi:role="line">(safe, using evolve)</tspan></text>
+ sodipodi:role="line"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">(safe, using evolve)</tspan></text>
</g>
<g
id="g4022"
@@ -399,19 +399,19 @@
style="fill:none;stroke:#404040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 3;stroke-dashoffset:0" />
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-9"
y="107.76683"
x="67.426567"
- style="font-size:11.9999752px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#404040;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#404040;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
id="tspan6156-7"
sodipodi:role="line"
x="67.426567"
- y="107.76683">1</tspan></text>
+ y="107.76683"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">1</tspan></text>
</g>
<path
- style="fill:none;stroke:#404040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.94117647;stroke-dasharray:none;marker-end:url(#Arrow2Mend);display:inline"
+ style="display:inline;fill:none;stroke:#404040;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94117647;marker-end:url(#Arrow2Mend)"
d="m 21.991109,145.71407 38.508895,0"
id="path8263-2"
inkscape:connector-type="polyline"
@@ -422,15 +422,15 @@
inkscape:connection-end-point="d4" />
<text
xml:space="preserve"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
x="122.10091"
y="140.49216"
- id="text4115"
- sodipodi:linespacing="125%"><tspan
+ id="text4115"><tspan
sodipodi:role="line"
id="tspan4117"
x="122.10091"
- y="140.49216" /></text>
+ y="140.49216"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif"> </tspan></text>
<g
id="g5472"
transform="translate(1.9995778e-6,1.240699)">
@@ -444,32 +444,31 @@
<text
inkscape:transform-center-x="2.6044813"
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-9-2"
y="148.84123"
x="127.4267"
- style="font-size:11.9999752px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#404040;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#404040;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
id="tspan6156-7-4"
sodipodi:role="line"
x="127.4267"
- y="148.84123">2</tspan></text>
+ y="148.84123"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">2</tspan></text>
</g>
<text
xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
x="140.76923"
y="136.65099"
- id="text4119"
- sodipodi:linespacing="125%"><tspan
+ id="text4119"><tspan
sodipodi:role="line"
id="tspan4121"
x="140.76923"
y="136.65099"
- style="font-size:8px;font-weight:bold;-inkscape-font-specification:Sans Bold">T</tspan></text>
+ style="font-weight:bold;font-size:8px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold'">T</tspan></text>
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 3;stroke-dashoffset:0;marker-start:url(#DotM)"
- d="m 71.240874,154.7407 0,52.70603"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 3;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#DotM)"
+ d="m 71.240874,154.7407 v 52.70603"
id="path4123"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -479,56 +478,58 @@
inkscape:connection-end-point="d4" />
<text
xml:space="preserve"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
x="175.07857"
y="112.16577"
- id="text4787"
- sodipodi:linespacing="100%"><tspan
+ id="text4787"><tspan
sodipodi:role="line"
x="175.07857"
y="112.16577"
- id="tspan4791">temporary</tspan><tspan
+ id="tspan4791"
+ style="font-size:10px;line-height:1;font-family:sans-serif">temporary</tspan><tspan
sodipodi:role="line"
x="175.07857"
y="122.16577"
- id="tspan4795">amend</tspan><tspan
+ id="tspan4795"
+ style="font-size:10px;line-height:1;font-family:sans-serif">amend</tspan><tspan
sodipodi:role="line"
x="175.07857"
y="132.16577"
- id="tspan4797">commit</tspan></text>
+ id="tspan4797"
+ style="font-size:10px;line-height:1;font-family:sans-serif">commit</tspan></text>
<text
xml:space="preserve"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
x="51.716301"
y="112.74194"
- id="text4799"
- sodipodi:linespacing="125%"><tspan
+ id="text4799"><tspan
sodipodi:role="line"
id="tspan4801"
x="51.716301"
- y="112.74194">obsolete (and hidden)</tspan></text>
+ y="112.74194"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete (and hidden)</tspan></text>
<text
xml:space="preserve"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
x="94.602974"
y="171.26965"
- id="text4803"
- sodipodi:linespacing="125%"><tspan
+ id="text4803"><tspan
sodipodi:role="line"
id="tspan4805"
x="94.602974"
- y="171.26965">precursor</tspan></text>
+ y="171.26965"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">precursor</tspan></text>
<text
xml:space="preserve"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
x="94.461372"
y="189.68568"
- id="text4807"
- sodipodi:linespacing="125%"><tspan
+ id="text4807"><tspan
sodipodi:role="line"
id="tspan4809"
x="94.461372"
- y="189.68568">successor</tspan></text>
+ y="189.68568"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">successor</tspan></text>
<path
style="fill:none;stroke:#7d7d7d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="M 92.837054,168.99918 C 80.990247,168.9329 79.499863,165.60079 77.196029,156.38545"
@@ -578,7 +579,7 @@
</g>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker-end:url(#Arrow2Mend-2)"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 81.981743,145.71407 38.518257,0"
id="path3069"
inkscape:connector-type="polyline"
