--- a/docs/figures/figure-ug04.svg Thu Apr 25 15:14:21 2019 -0700
+++ b/docs/figures/figure-ug04.svg Sat Apr 27 14:42:48 2019 -0400
@@ -15,7 +15,7 @@
height="205"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug04.svg">
<defs
id="defs4">
@@ -228,8 +228,10 @@
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
- originx="0.078090195px"
- originy="-3032.6372px" />
+ originx="0.078090195"
+ originy="-3032.6372"
+ spacingx="1"
+ spacingy="1" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -260,13 +262,12 @@
style="fill:none;stroke:#000000;stroke-width:0.99999779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
transform="scale(0.9999978,1.0000022)"
- sodipodi:linespacing="125%"
id="text5217"
y="14.714343"
x="7.426435"
- style="font-size:11.9999733px;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:11.9999733px;line-height:1.25;font-family:sans-serif;stroke:none"
y="14.714343"
x="7.426435"
id="tspan5219"
@@ -284,19 +285,19 @@
style="fill:none;stroke:#000000;stroke-width:0.99999779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
transform="scale(0.9999978,1.0000022)"
- sodipodi:linespacing="125%"
id="text5217-8"
y="14.714343"
x="67.426567"
- style="font-size:11.9999733px;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="67.426567"
- y="14.714343">5</tspan></text>
+ y="14.714343"
+ style="font-size:11.9999733px;line-height:1.25;font-family:sans-serif">5</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:0.99999779px;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.99999779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
d="m 21.981731,10.168036 38.518259,10e-7"
id="path8263"
inkscape:connector-type="polyline"
@@ -316,16 +317,15 @@
y="238.83586" />
<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="390.00699"
y="252.23067"
- id="text5217-7"
- sodipodi:linespacing="125%"><tspan
+ id="text5217-7"><tspan
sodipodi:role="line"
id="tspan5219-3"
x="390.00699"
y="252.23067"
- style="stroke:none">3</tspan></text>
+ style="font-size:12px;line-height:1.25;font-family:sans-serif;stroke:none">3</tspan></text>
</g>
</g>
<g
@@ -343,20 +343,20 @@
y="131.44673" />
<text
xml:space="preserve"
- 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"
x="67.447083"
y="144.84122"
id="text5217-8-7"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan3914"
x="67.447083"
- y="144.84122">6</tspan></text>
+ y="144.84122"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">6</tspan></text>
</g>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:0.99999988px;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:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-6)"
d="m 18.903021,117.9925 44.684942,52.70603"
id="path5012"
inkscape:connector-type="polyline"
@@ -380,74 +380,74 @@
y="94.372253" />
<text
xml:space="preserve"
- 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"
x="67.426567"
y="107.76683"
id="text5217-8-9"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
y="107.76683"
x="67.426567"
sodipodi:role="line"
- id="tspan6156-7">5</tspan></text>
+ id="tspan6156-7"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">5</tspan></text>
</g>
</g>
<path
- style="fill:none;stroke:#404040;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.94117647;stroke-dasharray:none;marker-end:url(#Arrow2Mend);display:inline"
- d="m 21.991099,108.96587 38.508907,0"
+ style="display:inline;fill:none;stroke:#404040;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94117647;marker-end:url(#Arrow2Mend)"
+ d="M 21.991099,108.96587 H 60.500006"
id="path8263-2"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0" />
<text
xml:space="preserve"
- style="font-size:9.99999905px;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.10089"
y="139.74393"
- id="text4115"
- sodipodi:linespacing="125%"><tspan
+ id="text4115"><tspan
sodipodi:role="line"
id="tspan4117"
x="122.10089"
- y="139.74393" /></text>
+ y="139.74393"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif"> </tspan></text>
<path
- style="fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999986, 2.99999958;stroke-dashoffset:0;marker-start:url(#DotM)"
- d="m 71.240876,117.9925 0,52.70603"
+ style="fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.99999986, 2.99999958;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#DotM)"
+ d="m 71.240876,117.9925 v 52.70603"
id="path4123"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0" />
<text
xml:space="preserve"
- style="font-size:9.99999905px;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="131.67636"
y="97.973274"
- id="text4799"
- sodipodi:linespacing="125%"><tspan
+ id="text4799"><tspan
sodipodi:role="line"
id="tspan4801"
x="131.67636"
- y="97.973274">obsolete, hidden</tspan></text>
+ y="97.973274"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">obsolete, hidden</tspan></text>
<text
xml:space="preserve"
- style="font-size:9.99999905px;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.602959"
y="134.52141"
- id="text4803"
- sodipodi:linespacing="125%"><tspan
+ id="text4803"><tspan
sodipodi:role="line"
id="tspan4805"
x="94.602959"
- y="134.52141">precursor</tspan></text>
+ y="134.52141"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">precursor</tspan></text>
<text
xml:space="preserve"
- style="font-size:9.99999905px;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.461357"
y="152.93744"
- id="text4807"
- sodipodi:linespacing="125%"><tspan
+ id="text4807"><tspan
sodipodi:role="line"
id="tspan4809"
x="94.461357"
- y="152.93744">successor</tspan></text>
+ y="152.93744"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">successor</tspan></text>
<path
style="fill:none;stroke:#7d7d7d;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="M 92.83703,132.25098 C 80.990226,132.18468 79.499843,128.85259 77.19601,119.63725"
@@ -460,34 +460,36 @@
inkscape:connector-curvature="0" />
<text
xml:space="preserve"
- style="font-size:9.99999905px;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="131.8273"
y="14.09236"
- id="text4799-8"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8"><tspan
sodipodi:role="line"
id="tspan4801-4"
x="131.8273"
- y="14.09236">working dir (clean)</tspan></text>
+ y="14.09236"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir (clean)</tspan></text>
<text
xml:space="preserve"
- style="font-size:9.99999905px;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="133.3548"
y="177.91992"
- id="text4799-8-1"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8-1"><tspan
sodipodi:role="line"
x="133.3548"
y="177.91992"
- id="tspan3129">working dir</tspan><tspan
+ id="tspan3129"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</tspan><tspan
sodipodi:role="line"
x="133.3548"
y="190.41992"
- id="tspan3137">(with uncommitted</tspan><tspan
+ id="tspan3137"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">(with uncommitted</tspan><tspan
sodipodi:role="line"
x="133.3548"
y="202.91992"
- id="tspan3135">changes to f1 f2 ...)</tspan></text>
+ id="tspan3135"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">changes to f1 f2 ...)</tspan></text>
<path
style="color:#000000;fill:none;stroke:#707070;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow2Mend-2);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 127.70873,11.814007 C 109.60365,21.89832 105.56713,4.2966494 86.402349,8.4033887"
@@ -503,18 +505,18 @@
transform="translate(1.9967556e-6,-0.17817035)">
<text
transform="scale(0.9999978,1.0000022)"
- sodipodi:linespacing="125%"
id="text5217-8-0"
y="58.841717"
x="46.92271"
- style="font-size:11.99999809px;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="58.841717"
x="46.92271"
id="tspan8594"
- sodipodi:role="line">hg uncommit <tspan
+ sodipodi:role="line"
+ style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg uncommit <tspan
id="tspan3131"
- style="font-style:italic">f1 f2 ...</tspan></tspan></text>
+ style="font-style:italic;font-family:monospace">f1 f2 ...</tspan></tspan></text>
<g
transform="translate(-0.59241834,4.9316169)"
id="g6372">
