[PATCH 01 of 14 evolve-ext] docs: import figure diagrams with inkscape 0.92
Matt Harbison
mharbison72 at gmail.com
Sun Apr 28 04:28:48 UTC 2019
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1556390568 14400
# Sat Apr 27 14:42:48 2019 -0400
# Node ID 649bc44846287d4f7221e6b19f2f7849d015ea20
# Parent 30a54490423874be7e53c401c2de3a614792c221
docs: import figure diagrams with inkscape 0.92
No changes to the content here. This simply accepts the default option ("This
file contains digital artwork for screen display") on the prompt when first
opened, which is trying to upgrade from 90DPI to 96DPI.
diff --git a/docs/figures/figure-ug01.svg b/docs/figures/figure-ug01.svg
--- a/docs/figures/figure-ug01.svg
+++ b/docs/figures/figure-ug01.svg
@@ -15,7 +15,7 @@
height="150"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug01.svg">
<defs
id="defs4">
@@ -180,8 +180,10 @@
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
- originx="0.078084198px"
- originy="-2924.5747px" />
+ originx="0.078084198"
+ originy="-2924.5747"
+ spacingx="1"
+ spacingy="1" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -211,13 +213,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"
@@ -235,19 +236,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,9.6755275 38.518266,4.2e-6"
id="path8263"
inkscape:connector-type="polyline"
@@ -258,16 +259,16 @@
inkscape:connection-end-point="d4" />
<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: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"
x="46.543751"
y="42.826393"
id="text5217-8-0"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan8594"
x="46.543751"
- y="42.826393">hg commit --amend</tspan></text>
+ y="42.826393"
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg commit --amend</tspan></text>
<path
style="fill:none;stroke:#808080;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 36.655932,74.035228 3.649333,6.320665 3.711171,-6.427764"
@@ -298,13 +299,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"
@@ -322,16 +322,16 @@
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="121.11791"
x="65.68634"
- 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="121.11791"
x="65.68634"
id="tspan3914"
- sodipodi:role="line">1'</tspan></text>
+ sodipodi:role="line"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">1'</tspan></text>
</g>
<g
id="g3969"
@@ -355,20 +355,20 @@
style="fill:none;stroke:#686868;stroke-width:0.68990517;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="star" />
<text
- sodipodi:linespacing="125%"
id="text3957"
y="84.170212"
x="69.021271"
- 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="84.170212"
x="69.021271"
id="tspan3959"
- sodipodi:role="line">poof!</tspan></text>
+ sodipodi:role="line"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">poof!</tspan></text>
</g>
<path
- style="fill:none;stroke:url(#linearGradient3986);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:2, 1;stroke-dashoffset:0;marker-mid:none;marker-end:none"
- d="m 21.990865,103.39791 57.925771,-0.005"
+ style="fill:none;stroke:url(#linearGradient3986);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1;marker-mid:none;marker-end:none"
+ d="m 21.990865,103.39783 57.926859,-0.006"
id="path3974"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -388,13 +388,13 @@
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: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="46.760448"
y="58.872295"
- id="text5223"
- sodipodi:linespacing="125%"><tspan
+ id="text5223"><tspan
sodipodi:role="line"
id="tspan5227"
x="46.760448"
- y="58.872295">(destructive, not using evolve)</tspan></text>
+ y="58.872295"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">(destructive, not using evolve)</tspan></text>
</svg>
diff --git a/docs/figures/figure-ug02.svg b/docs/figures/figure-ug02.svg
--- a/docs/figures/figure-ug02.svg
+++ b/docs/figures/figure-ug02.svg
@@ -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"
diff --git a/docs/figures/figure-ug03.svg b/docs/figures/figure-ug03.svg
--- a/docs/figures/figure-ug03.svg
+++ b/docs/figures/figure-ug03.svg
@@ -15,7 +15,7 @@
height="150"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug03.svg">
<defs
id="defs4">
@@ -172,8 +172,10 @@
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
- originx="0.078084198px"
- originy="-2924.5747px" />
+ originx="0.078084198"
+ originy="-2924.5747"
+ spacingx="1"
+ spacingy="1" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -206,17 +208,16 @@
y="0.64889121" />
<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="7.4264359"
y="14.043668"
id="text5217"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan5219"
x="7.4264359"
y="14.043668"
- style="stroke:none">3</tspan></text>
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif;stroke:none">3</tspan></text>
</g>
<g
id="g6612">
@@ -229,39 +230,39 @@
y="0.64889765" />
<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.426567"
y="14.043674"
id="text5217-8"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
y="14.043674"
x="67.426567"
sodipodi:role="line"
- id="tspan3900">4</tspan></text>
+ id="tspan3900"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">4</tspan></text>
</g>
<path
inkscape:connector-curvature="0"
inkscape:connector-type="polyline"
id="path8263"
d="m 21.981735,9.6755275 38.518266,4.2e-6"
- 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)" />
</g>
<g
id="g6397"
transform="translate(1.2139669,17.353636)">
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-0"
y="53.910118"
x="46.543751"
- 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="53.910118"
x="46.543751"
id="tspan8594"
- sodipodi:role="line">hg prune .</tspan></text>
+ sodipodi:role="line"
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg prune .</tspan></text>
<g
id="g6372">
<path
@@ -296,14 +297,13 @@
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-9"
y="115.1729"
x="7.4264359"
- 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="tspan3904"
- style="stroke:none"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif;stroke:none"
y="115.1729"
x="7.4264359"
sodipodi:role="line">3</tspan></text>
@@ -319,20 +319,20 @@
style="fill:none;stroke:#000000;stroke-width:0.99999791;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999791,1.99999583;stroke-dashoffset:0" />
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-2"
y="115.1729"
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:#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="tspan3908"
sodipodi:role="line"
x="67.426567"
- y="115.1729">4</tspan></text>
+ y="115.1729"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">4</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"
- d="m 21.981736,110.80498 38.518268,0"
+ 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.981736,110.80498 H 60.500004"
id="path8263-2"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -342,48 +342,47 @@
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="120.84515"
y="108.62753"
- id="text4799"
- sodipodi:linespacing="100%"><tspan
+ id="text4799"><tspan
sodipodi:role="line"
id="tspan4801"
x="120.84515"
y="108.62753"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Italic">obsolete,</tspan><tspan
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;writing-mode:lr-tb;text-anchor:start">obsolete,</tspan><tspan
sodipodi:role="line"
x="120.84515"
y="118.62753"
id="tspan4155"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Italic">hidden,</tspan><tspan
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;writing-mode:lr-tb;text-anchor:start">hidden,</tspan><tspan
sodipodi:role="line"
x="120.84515"
y="128.62753"
id="tspan4157"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans Italic">no successors</tspan></text>
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'Sans Italic';text-align:start;writing-mode:lr-tb;text-anchor:start">no successors</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="87.810272"
y="8.7751856"
- id="text4353"
- sodipodi:linespacing="125%"><tspan
+ id="text4353"><tspan
sodipodi:role="line"
id="tspan4355"
x="87.810272"
- y="8.7751856">working dir</tspan></text>
+ y="8.7751856"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">working dir</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="20.528839"
y="144.07831"
- id="text4353-8"
- sodipodi:linespacing="125%"><tspan
+ id="text4353-8"><tspan
sodipodi:role="line"
id="tspan4355-6"
x="20.528839"
- y="144.07831">working dir</tspan></text>
+ y="144.07831"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">working dir</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;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;marker-end:url(#Arrow2Mend-7)"
d="m 20.030453,140.89525 c -8.427525,-2.11036 -7.688456,-10.62543 -7.688456,-18.00718"
diff --git a/docs/figures/figure-ug04.svg b/docs/figures/figure-ug04.svg
--- a/docs/figures/figure-ug04.svg
+++ b/docs/figures/figure-ug04.svg
@@ -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">
diff --git a/docs/figures/figure-ug05.svg b/docs/figures/figure-ug05.svg
--- a/docs/figures/figure-ug05.svg
+++ b/docs/figures/figure-ug05.svg
@@ -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-ug05.svg">
<defs
id="defs4">
@@ -284,8 +284,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">
@@ -314,13 +316,12 @@
id="rect2987"
style="fill:none;stroke:#000000;stroke-width:0.99999946;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="14.841532"
x="7.4264469"
- style="font-size:11.99999332px;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.99999332px;line-height:1.25;font-family:sans-serif;stroke:none"
y="14.841532"
x="7.4264469"
id="tspan5219"
@@ -340,20 +341,20 @@
y="1.8896017" />
<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.426575"
y="15.284375"
id="text5217-8"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
y="15.284375"
x="67.426575"
sodipodi:role="line"
- id="tspan6156">7</tspan></text>
+ id="tspan6156"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">7</tspan></text>
</g>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:0.99999946px;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.99999946px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
d="m 21.981805,10.473365 38.518392,1e-6"
id="path8263"
inkscape:connector-type="polyline"
@@ -370,13 +371,12 @@
style="fill:none;stroke:#000000;stroke-width:1.0000037;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
transform="scale(1.0000037,0.99999628)"
- sodipodi:linespacing="125%"
id="text5217-7"
y="150.08279"
x="7.3916588"
- style="font-size:12.00004482px;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:12.00004482px;line-height:1.25;font-family:sans-serif;stroke:none"
y="150.08279"
x="7.3916588"
id="tspan5219-3"
@@ -394,19 +394,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="232.20978"
x="112.22823"
- 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="232.20978"
x="112.22823"
id="tspan3914"
- sodipodi:role="line">10</tspan></text>
+ sodipodi:role="line"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">10</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.241201,159.5 45.999463,59.31546"
id="path5012"
inkscape:connector-type="polyline"
@@ -417,18 +417,18 @@
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>
<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);display:inline"
- d="m 71.240899,159.5 -2.6e-5,59.31546"
+ style="display:inline;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.305628,159.5 -0.05621,59.31546"
id="path4123"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -438,41 +438,41 @@
inkscape:connection-start-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: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="145.71631"
y="120.74194"
- id="text4799"
- sodipodi:linespacing="125%"><tspan
+ id="text4799"><tspan
sodipodi:role="line"
x="145.71631"
y="120.74194"
- id="tspan4866">obsolete, hidden precursors</tspan></text>
+ id="tspan4866"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete, hidden precursors</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="140.08366"
y="221.99774"
- id="text4807"
- sodipodi:linespacing="125%"><tspan
+ id="text4807"><tspan
sodipodi:role="line"
id="tspan4809"
x="140.08366"
- y="221.99774">successor, working dir</tspan></text>
+ y="221.99774"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">successor, working dir</tspan></text>
<g
id="g4748"
transform="translate(66,4)">
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-0"
y="75.774689"
x="46.543758"
- 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="75.774689"
x="46.543758"
id="tspan8594"
- sodipodi:role="line">hg fold 7</tspan></text>
+ sodipodi:role="line"
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg fold 7</tspan></text>
<g
transform="translate(1.9995778e-6,1.240701)"
id="g6493">
@@ -511,16 +511,16 @@
y="1.8896017" />
<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.426575"
y="15.284375"
id="text5217-8-72"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
y="15.284375"
x="67.426575"
sodipodi:role="line"
- id="tspan6156-9">8</tspan></text>
+ id="tspan6156-9"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">8</tspan></text>
</g>
</g>
<g
@@ -537,16 +537,16 @@
y="1.8896017" />
<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.426575"
y="15.284375"
id="text5217-8-3"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
y="15.284375"
x="67.426575"
sodipodi:role="line"
- id="tspan6156-0">9</tspan></text>
+ id="tspan6156-0"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">9</tspan></text>
</g>
</g>
<path
@@ -561,7 +561,7 @@
inkscape:connection-end-point="d4" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
- d="m 141.98174,10.473366 38.51826,0"
+ d="M 141.98174,10.473366 H 180.5"
id="path3180"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -579,16 +579,16 @@
id="rect2987-4-7"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.9999994, 2.99999821;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-1"
y="154.84146"
x="67.426483"
- style="font-size:11.99999332px;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-7"
sodipodi:role="line"
x="67.426483"
- y="154.84146">7</tspan></text>
+ y="154.84146"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">7</tspan></text>
</g>
<g
id="g4842">
@@ -601,16 +601,16 @@
style="fill:none;stroke:#000000;stroke-width:0.99999791;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999791, 2.99999374;stroke-dashoffset:0" />
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-72-7"
y="154.84122"
x="127.42651"
- 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-9-5"
sodipodi:role="line"
x="127.42651"
- y="154.84122">8</tspan></text>
+ y="154.84122"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">8</tspan></text>
</g>
<g
id="g4847">
@@ -623,19 +623,19 @@
style="fill:none;stroke:#000000;stroke-width:0.99999791;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999791, 2.99999374;stroke-dashoffset:0" />
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-3-2"
y="154.84122"
x="187.42664"
- 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-0-8"
sodipodi:role="line"
x="187.42664"
- y="154.84122">9</tspan></text>
+ y="154.84122"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">9</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-2);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-2)"
d="m 81.981806,150.47337 38.518004,0"
id="path3178-7"
inkscape:connector-type="polyline"
@@ -645,8 +645,8 @@
inkscape:connection-end="#g4842"
inkscape:connection-end-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
- d="m 141.98155,150.47337 38.51827,0"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
+ d="m 141.98155,150.47337 h 38.51827"
id="path3180-3"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -655,7 +655,7 @@
inkscape:connection-end="#g4847"
inkscape:connection-end-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448)"
d="M 21.981991,150.47336 60.5,150.47337"
id="path4542"
inkscape:connector-type="polyline"
@@ -665,7 +665,7 @@
inkscape:connection-end="#g4837"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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 124.24048,159.5 78.241066,218.81546"
id="path4123-2"
inkscape:connector-type="polyline"
@@ -675,7 +675,7 @@
inkscape:connection-end="#g4533"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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 180.49982,157.39844 81.981738,220.91702"
id="path4123-2-7"
inkscape:connector-type="polyline"
@@ -706,15 +706,15 @@
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="219.76105"
y="45.381439"
- id="text4799-8"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8"><tspan
sodipodi:role="line"
id="tspan4801-4"
x="219.76105"
- y="45.381439">working dir</tspan></text>
+ y="45.381439"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</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;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;marker-end:url(#marker4448)"
d="m 216.5322,43.418725 c -17.12038,-3.247846 -32.15429,-0.004 -25.47437,-18.707746"
diff --git a/docs/figures/figure-ug06.svg b/docs/figures/figure-ug06.svg
--- a/docs/figures/figure-ug06.svg
+++ b/docs/figures/figure-ug06.svg
@@ -15,7 +15,7 @@
height="310"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug06.svg">
<defs
id="defs4">
@@ -354,8 +354,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">
@@ -371,16 +373,16 @@
</metadata>
<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: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"
x="112.5439"
y="113.7746"
id="text5217-8-0"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan8594"
x="112.5439"
- y="113.7746">hg amend</tspan></text>
+ y="113.7746"
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg amend</tspan></text>
<g
id="g6493"
transform="translate(63.844066,39.240701)">
@@ -418,16 +420,15 @@
y="35.446732" />
<text
xml:space="preserve"
- style="font-size:11.99999332px;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="3.3424675"
y="48.84153"
- id="text5217"
- sodipodi:linespacing="125%"><tspan
+ id="text5217"><tspan
sodipodi:role="line"
id="tspan5219"
x="3.3424675"
y="48.84153"
- style="stroke:none">10</tspan></text>
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif;stroke:none">10</tspan></text>
<rect
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="rect2987-4"
@@ -437,17 +438,17 @@
y="35.446732" />
<text
xml:space="preserve"
- style="font-size:11.99999332px;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="63.497932"
y="48.84153"
- id="text5217-8"
- sodipodi:linespacing="125%"><tspan
+ id="text5217-8"><tspan
y="48.84153"
x="63.497932"
sodipodi:role="line"
- id="tspan6156">11</tspan></text>
+ id="tspan6156"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">11</tspan></text>
<path
- style="fill:none;stroke:#000000;stroke-width:0.99999946px;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.99999946px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
d="m 21.981805,44.473365 38.518386,10e-7"
id="path8263"
inkscape:connector-type="polyline"
@@ -466,13 +467,12 @@
style="fill:none;stroke:#000000;stroke-width:1.0000037;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
transform="scale(1.0000037,0.9999963)"
- sodipodi:linespacing="125%"
id="text5217-7"
y="154.84212"
x="3.3424876"
- style="font-size:12.00004482px;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:12.00004482px;line-height:1.25;font-family:sans-serif;stroke:none"
y="154.84212"
x="3.3424876"
id="tspan5219-3"
@@ -487,18 +487,18 @@
y="252.81546" />
<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="63.342594"
y="266.20969"
id="text5217-8-7"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan3914"
x="63.342594"
- y="266.20969">15</tspan></text>
+ y="266.20969"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">15</tspan></text>
<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.241201,193.5 45.999463,59.31546"
id="path5012"
inkscape:connector-type="polyline"
@@ -509,15 +509,15 @@
inkscape:connection-start-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="174.49216"
- id="text4115"
- sodipodi:linespacing="125%"><tspan
+ id="text4115"><tspan
sodipodi:role="line"
id="tspan4117"
x="122.10091"
- y="174.49216" /></text>
+ y="174.49216"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">Â </tspan></text>
<g
id="g3118"
transform="translate(0,34)">
@@ -530,16 +530,16 @@
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-72"
y="14.841505"
x="123.54487"
- 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-9"
sodipodi:role="line"
x="123.54487"
- y="14.841505">12</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">12</tspan></text>
</g>
<g
id="g3126"
@@ -553,19 +553,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-3"
y="14.841505"
x="183.42488"
- 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-0"
sodipodi:role="line"
x="183.42488"
- y="14.841505">13</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">13</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-2);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-2)"
d="m 81.981997,44.473366 38.518003,0"
id="path3178"
inkscape:connector-type="polyline"
@@ -575,7 +575,7 @@
inkscape:connection-end="#g3118"
inkscape:connection-end-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);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-2)"
d="m 141.98174,44.473366 38.51826,0"
id="path3180"
inkscape:connector-type="polyline"
@@ -585,7 +585,7 @@
inkscape:connection-end="#g3126"
inkscape:connection-end-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448)"
d="M 21.981991,184.65238 60.5,185.29435"
id="path4542"
inkscape:connector-type="polyline"
@@ -594,27 +594,30 @@
inkscape:connection-start-point="d4" />
<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="86.768402"
y="12.367264"
- id="text4799-8"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8"><tspan
sodipodi:role="line"
id="tspan4801-4"
x="86.768402"
- y="12.367264">working dir</tspan></text>
+ y="12.367264"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</tspan></text>
<flowRoot
xml:space="preserve"
id="flowRoot3104"
- 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.01%;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"
transform="translate(0,34)"><flowRegion
- id="flowRegion3106"><rect
+ id="flowRegion3106"
+ style="font-family:sans-serif"><rect
id="rect3108"
width="60.309383"
height="49.300529"
x="-25.368233"
- y="-22.34952" /></flowRegion><flowPara
- id="flowPara3110"></flowPara></flowRoot> <g
+ y="-22.34952"
+ style="font-family:sans-serif" /></flowRegion><flowPara
+ id="flowPara3110"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">Â </flowPara></flowRoot> <g
id="g5560"
transform="translate(0,34)">
<rect
@@ -625,16 +628,16 @@
id="rect2987-4-8"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 4;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-4"
y="154.84152"
x="63.497734"
- style="font-size:11.99999332px;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-4"
sodipodi:role="line"
x="63.497734"
- y="154.84152">11</tspan></text>
+ y="154.84152"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">11</tspan></text>
</g>
<g
transform="translate(-2.0371355e-4,174)"
@@ -648,16 +651,16 @@
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-72-7"
y="14.841505"
x="123.54487"
- 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-9-7"
sodipodi:role="line"
x="123.54487"
- y="14.841505">12</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">12</tspan></text>
</g>
<g
transform="translate(-2.0371355e-4,174)"
@@ -671,19 +674,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-3-9"
y="14.841505"
x="183.42488"
- 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-0-0"
sodipodi:role="line"
x="183.42488"
- y="14.841505">13</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">13</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-2);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-2)"
d="m 81.981806,184.47337 38.517994,0"
id="path3178-0"
inkscape:connector-type="polyline"
@@ -691,8 +694,8 @@
inkscape:connection-end="#g3118-0"
inkscape:connection-end-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
- d="m 141.98154,184.47337 38.51826,0"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
+ d="M 141.98154,184.47337 H 180.4998"
id="path3180-2"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -701,7 +704,7 @@
inkscape:connection-end="#g3126-3"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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.240899,193.5 -2.6e-5,59.31546"
id="path4123"
inkscape:connector-type="polyline"
@@ -710,30 +713,31 @@
inkscape:connection-end-point="d4" />
<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: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="18.790892"
y="142.23888"
- id="text4799-8-6"
- sodipodi:linespacing="100%"><tspan
+ id="text4799-8-6"><tspan
sodipodi:role="line"
id="tspan4801-4-0"
x="18.790892"
- y="142.23888">obsolete</tspan><tspan
+ y="142.23888"
+ style="font-size:9.99999905px;line-height:1;font-family:sans-serif">obsolete</tspan><tspan
sodipodi:role="line"
x="18.790892"
y="152.23888"
- id="tspan4452">but visible</tspan></text>
+ id="tspan4452"
+ style="font-size:9.99999905px;line-height:1;font-family:sans-serif">but visible</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="150.66776"
y="148.39902"
- id="text4454"
- sodipodi:linespacing="125%"><tspan
+ id="text4454"><tspan
sodipodi:role="line"
id="tspan4456"
x="150.66776"
- y="148.39902">unstable</tspan></text>
+ y="148.39902"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">unstable</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(#marker3230);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 41.433633,155.93241 c 4.445697,11.92656 24.017716,1.13391 25.948336,14.64825"
@@ -762,29 +766,28 @@
<text
inkscape:transform-center-x="2.6044813"
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-9-2"
y="225.24431"
x="121.1868"
- 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="121.1868"
- y="225.24431">14</tspan></text>
+ y="225.24431"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">14</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="108.67482"
y="206.41029"
- id="text4119"
- sodipodi:linespacing="125%"><tspan
+ id="text4119"><tspan
sodipodi:role="line"
id="tspan4121"
x="108.67482"
y="206.41029"
- 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:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker3230)"
d="m 79.976346,193.5 12.52908,12.94673"
@@ -797,42 +800,46 @@
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="143.52129"
y="224.8358"
- id="text4787"
- sodipodi:linespacing="100%"><tspan
+ id="text4787"><tspan
sodipodi:role="line"
x="143.52129"
y="224.8358"
- 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="143.52129"
y="234.8358"
- 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="143.52129"
y="244.8358"
- id="tspan4797">commit;</tspan><tspan
+ id="tspan4797"
+ style="font-size:10px;line-height:1;font-family:sans-serif">commit;</tspan><tspan
sodipodi:role="line"
x="143.52129"
y="254.8358"
- id="tspan6283">obsolete and</tspan><tspan
+ id="tspan6283"
+ style="font-size:10px;line-height:1;font-family:sans-serif">obsolete and</tspan><tspan
sodipodi:role="line"
x="143.52129"
y="264.83582"
- id="tspan6285">hidden</tspan></text>
+ id="tspan6285"
+ style="font-size:10px;line-height:1;font-family:sans-serif">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="95.495201"
y="291.81802"
- id="text4799-8-7"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8-7"><tspan
sodipodi:role="line"
id="tspan4801-4-8"
x="95.495201"
- y="291.81802">working dir</tspan></text>
+ y="291.81802"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</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(#marker3230);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 114.6749,14.053603 C 108.77815,29.370318 80.769041,12.646358 73.241271,33.724116"
diff --git a/docs/figures/figure-ug07.svg b/docs/figures/figure-ug07.svg
--- a/docs/figures/figure-ug07.svg
+++ b/docs/figures/figure-ug07.svg
@@ -13,7 +13,7 @@
height="220"
id="svg8082"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug07.svg">
<defs
id="defs8084">
@@ -227,16 +227,16 @@
transform="translate(0,18.65699)">
<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: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"
x="113.19138"
y="21.624107"
id="text5217-8-0"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan8594"
x="113.19138"
- y="21.624107">hg evolve --all</tspan></text>
+ y="21.624107"
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
<g
id="g6372"
transform="translate(63.844068,-32.28608)">
@@ -272,13 +272,12 @@
style="fill:none;stroke:#000000;stroke-width:1.0000037;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
transform="scale(1.0000037,0.9999963)"
- sodipodi:linespacing="125%"
id="text5217-7"
y="154.84212"
x="3.3424876"
- style="font-size:12.00004482px;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:12.00004482px;line-height:1.25;font-family:sans-serif;stroke:none"
y="154.84212"
x="3.3424876"
id="tspan5219-3"
@@ -293,18 +292,18 @@
y="136.78973" />
<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="63.342571"
y="150.18422"
id="text5217-8-7"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan3914"
x="63.342571"
- y="150.18422">15</tspan></text>
+ y="150.18422"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">15</tspan></text>
<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.241201,77.474272 64.240665,136.78973"
id="path5012"
inkscape:connector-type="polyline"
@@ -314,7 +313,7 @@
inkscape:connection-start="#g3291"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448)"
d="M 21.981991,68.626653 60.499999,69.26862"
id="path4542"
inkscape:connector-type="polyline"
@@ -332,16 +331,16 @@
id="rect2987-4-8"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 4;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-4"
y="154.84152"
x="63.497734"
- style="font-size:11.99999332px;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-4"
sodipodi:role="line"
x="63.497734"
- y="154.84152">11</tspan></text>
+ y="154.84152"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">11</tspan></text>
</g>
<g
id="g8702"
@@ -355,16 +354,16 @@
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 4;stroke-dashoffset:0" />
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-72-7"
y="88.815628"
x="123.54466"
- 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-9-7"
sodipodi:role="line"
x="123.54466"
- y="88.815628">12</tspan></text>
+ y="88.815628"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">12</tspan></text>
</g>
<g
id="g8707"
@@ -378,19 +377,19 @@
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 4;stroke-dashoffset:0" />
<text
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-3-9"
y="88.815628"
x="183.42468"
- 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-0-0"
sodipodi:role="line"
x="183.42468"
- y="88.815628">13</tspan></text>
+ y="88.815628"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">13</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-2);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-2)"
d="m 81.981809,68.44765 38.517981,-2e-6"
id="path3178-0"
inkscape:connector-type="polyline"
@@ -398,8 +397,8 @@
inkscape:connection-end="#g8702"
inkscape:connection-end-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
- d="m 141.98153,68.447648 38.51827,0"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
+ d="M 141.98153,68.447648 H 180.4998"
id="path3180-2"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -408,7 +407,7 @@
inkscape:connection-end="#g8707"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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.240899,77.47427 -2.6e-5,59.31546"
id="path4123"
inkscape:connector-type="polyline"
@@ -428,29 +427,28 @@
<text
inkscape:transform-center-x="2.6044813"
transform="scale(0.9999979,1.0000021)"
- sodipodi:linespacing="125%"
id="text5217-8-9-2"
y="225.24431"
x="121.1868"
- 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="121.1868"
- y="225.24431">14</tspan></text>
+ y="225.24431"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">14</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="108.67482"
y="89.753288"
- id="text4119"
- sodipodi:linespacing="125%"><tspan
+ id="text4119"><tspan
sodipodi:role="line"
id="tspan4121"
x="108.67482"
y="89.753288"
- 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:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker3230)"
d="M 80.157925,77.47427 92.323846,89.78974"
@@ -464,15 +462,18 @@
<flowRoot
xml:space="preserve"
id="flowRoot8394"
- 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.01%;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"
transform="translate(0,-36)"><flowRegion
- id="flowRegion8396"><rect
+ id="flowRegion8396"
+ style="font-family:sans-serif"><rect
id="rect8398"
width="311.2373"
height="172.50397"
x="13.690791"
- y="268.24911" /></flowRegion><flowPara
- id="flowPara8400" /></flowRoot> <g
+ y="268.24911"
+ style="font-family:sans-serif" /></flowRegion><flowPara
+ id="flowPara8400"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">Â </flowPara></flowRoot> <g
id="g8798"
transform="translate(28.427001,-38.337945)">
<rect
@@ -484,16 +485,16 @@
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-4"
y="188.52202"
x="94.915642"
- 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="188.52202"
x="94.915642"
id="tspan3914-6"
- sodipodi:role="line">16</tspan></text>
+ sodipodi:role="line"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">16</tspan></text>
</g>
<g
id="g8803"
@@ -507,19 +508,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-46"
y="188.52202"
x="174.91582"
- 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="188.52202"
x="174.91582"
id="tspan3914-1"
- sodipodi:role="line">17</tspan></text>
+ sodipodi:role="line"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">17</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448)"
d="m 81.981739,145.81637 38.518261,0"
id="path4542-5"
inkscape:connector-type="polyline"
@@ -529,7 +530,7 @@
inkscape:connection-end="#g8798"
inkscape:connection-end-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker4448)"
d="M 141.98174,145.77795 180.5,145.64016"
id="path4542-1"
inkscape:connector-type="polyline"
@@ -537,7 +538,7 @@
inkscape:connection-start="#g8798"
inkscape:connection-start-point="d4" />
<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);display:inline"
+ style="display:inline;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 131.24068,77.474283 1.6e-4,59.315457"
id="path4123-1"
inkscape:connector-type="polyline"
@@ -547,7 +548,7 @@
inkscape:connection-end="#g8798"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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 191.24069,77.474283 1.6e-4,59.315457"
id="path4123-14"
inkscape:connector-type="polyline"
@@ -558,37 +559,37 @@
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: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="226.23938"
y="81.810745"
- id="text3058"
- sodipodi:linespacing="125%"><tspan
+ id="text3058"><tspan
sodipodi:role="line"
id="tspan3060"
x="226.23938"
- y="81.810745">obsolete, hidden</tspan></text>
+ y="81.810745"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete, 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="243.1927"
y="151.52931"
- id="text6402"
- sodipodi:linespacing="125%"><tspan
+ id="text6402"><tspan
sodipodi:role="line"
id="tspan6404"
x="243.1927"
- y="151.52931">working dir</tspan></text>
+ y="151.52931"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">working dir</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="102"
y="184.34302"
- id="text7020"
- sodipodi:linespacing="125%"><tspan
+ id="text7020"><tspan
sodipodi:role="line"
id="tspan7022"
x="102"
- y="184.34302">successors</tspan></text>
+ y="184.34302"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">successors</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;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 214.5,51.843009 c 2.26039,0.588947 4.4416,0.9416 5.5,2 2.95364,2.953636 2.98797,53.512031 0.5,56.000001 -3.15839,3.15839 -5.49327,6.33109 -9,7.5"
diff --git a/docs/figures/figure-ug08.svg b/docs/figures/figure-ug08.svg
--- a/docs/figures/figure-ug08.svg
+++ b/docs/figures/figure-ug08.svg
@@ -13,7 +13,7 @@
height="190"
id="svg8392"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug08.svg">
<defs
id="defs8394">
@@ -132,7 +132,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -152,16 +152,16 @@
id="rect2987-4"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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="3.4977415"
- y="807.20361">18</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">18</tspan></text>
</g>
<g
id="g3118"
@@ -175,16 +175,16 @@
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-72"
y="14.841505"
x="123.54487"
- 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-9"
sodipodi:role="line"
x="123.54487"
- y="14.841505">19</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">19</tspan></text>
</g>
<g
id="g3126"
@@ -198,19 +198,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-3"
y="14.841505"
x="183.42488"
- 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-0"
sodipodi:role="line"
x="183.42488"
- y="14.841505">20</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">20</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-2);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-2)"
d="m 21.981806,796.83549 38.518193,4e-5"
id="path3178"
inkscape:connector-type="polyline"
@@ -220,8 +220,8 @@
inkscape:connection-start="#g8678"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
- d="m 81.981738,796.83555 38.518072,0"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
+ d="M 81.981738,796.83555 H 120.49981"
id="path3180"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -231,27 +231,27 @@
inkscape:connection-end-point="d4" />
<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="192.95625"
y="783.27075"
- id="text4799-8"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8"><tspan
sodipodi:role="line"
id="tspan4801-4"
x="192.95625"
- y="783.27075">working dir</tspan></text>
+ y="783.27075"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</tspan></text>
<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: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"
x="80.662636"
y="851.4538"
id="text5217-8-0"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan8594"
x="80.662636"
- y="851.4538">hg prune 19</tspan></text>
+ y="851.4538"
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg prune 19</tspan></text>
<g
id="g6372"
transform="translate(31.315375,797.54535)">
@@ -286,16 +286,16 @@
id="rect2987-4-9"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-32"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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-8"
sodipodi:role="line"
x="3.4977415"
- y="807.20361">18</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">18</tspan></text>
</g>
<rect
style="fill:none;stroke:#000000;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999946, 3.99999785;stroke-dashoffset:0"
@@ -306,15 +306,15 @@
y="892.8089" />
<text
xml:space="preserve"
- style="font-size:11.99999428px;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="63.544647"
y="906.20331"
- id="text5217-8-72-1"
- sodipodi:linespacing="125%"><tspan
+ id="text5217-8-72-1"><tspan
y="906.20331"
x="63.544647"
sodipodi:role="line"
- id="tspan6156-9-8">19</tspan></text>
+ id="tspan6156-9-8"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">19</tspan></text>
<g
id="g3126-8"
transform="matrix(1.0000032,0,0,0.99999991,-60.000385,891.36218)">
@@ -327,19 +327,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-3-8"
y="14.841505"
x="183.42488"
- 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-0-9"
sodipodi:role="line"
x="183.42488"
- y="14.841505">20</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">20</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 21.981875,901.83548 38.518126,5e-5"
id="path3178-9"
inkscape:connector-type="polyline"
@@ -347,7 +347,7 @@
inkscape:connection-start="#g8678-6"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 81.981808,901.83554 38.518382,0"
id="path3180-1"
inkscape:connector-type="polyline"
@@ -356,41 +356,42 @@
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: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="33.872818"
y="941.35645"
- id="text9295"
- sodipodi:linespacing="125%"><tspan
+ id="text9295"><tspan
sodipodi:role="line"
id="tspan9297"
x="33.872818"
- y="941.35645">obsolete</tspan><tspan
+ y="941.35645"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete</tspan><tspan
sodipodi:role="line"
x="33.872818"
y="953.85645"
- id="tspan9299">but visible</tspan></text>
+ id="tspan9299"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">but visible</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="125.75282"
y="939.66284"
- id="text9301"
- sodipodi:linespacing="125%"><tspan
+ id="text9301"><tspan
sodipodi:role="line"
id="tspan9303"
x="125.75282"
- y="939.66284">unstable</tspan></text>
+ y="939.66284"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">unstable</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="192.95625"
y="920.7381"
- id="text4799-8-4"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8-4"><tspan
sodipodi:role="line"
id="tspan4801-4-2"
x="192.95625"
- y="920.7381">working dir</tspan></text>
+ y="920.7381"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</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(#marker8695);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 188.0904,779.78292 c -26.25288,3.51598 -8.22083,22.5684 -39.59798,18.38478"
diff --git a/docs/figures/figure-ug09.svg b/docs/figures/figure-ug09.svg
--- a/docs/figures/figure-ug09.svg
+++ b/docs/figures/figure-ug09.svg
@@ -13,7 +13,7 @@
height="150"
id="svg10360"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug09.svg">
<defs
id="defs10362">
@@ -90,7 +90,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -101,16 +101,16 @@
transform="translate(-52.986766,123.22995)">
<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: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"
x="132.17838"
y="-88.939552"
id="text5217-8-0"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
sodipodi:role="line"
id="tspan8594"
x="132.17838"
- y="-88.939552">hg evolve --all</tspan></text>
+ y="-88.939552"
+ style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
<g
id="g6372"
transform="translate(82.830913,-142.84994)">
@@ -145,16 +145,16 @@
id="rect2987-4-9"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-32"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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-8"
sodipodi:role="line"
x="3.4977415"
- y="807.20361">18</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">18</tspan></text>
</g>
<g
id="g11168"
@@ -167,16 +167,16 @@
id="rect2987-4-02-6"
style="fill:none;stroke:#000000;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999946, 3.99999783;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-72-1"
y="-149.15291"
x="116.53148"
- style="font-size:11.99999428px;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-9-8"
sodipodi:role="line"
x="116.53148"
- y="-149.15291">19</tspan></text>
+ y="-149.15291"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">19</tspan></text>
</g>
<g
id="g11163"
@@ -189,19 +189,19 @@
id="rect2987-4-026-7"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 4;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-3-8"
y="-149.15244"
x="176.41162"
- style="font-size:11.99999428px;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-0-9"
sodipodi:role="line"
x="176.41162"
- y="-149.15244">20</tspan></text>
+ y="-149.15244"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">20</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 74.96872,-41.52073 38.51813,3.7e-5"
id="path3178-9"
inkscape:connector-type="polyline"
@@ -211,7 +211,7 @@
inkscape:connection-start="#g8678-6"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 134.96865,-41.520681 38.5184,1e-5"
id="path3180-1"
inkscape:connector-type="polyline"
@@ -231,16 +231,16 @@
id="rect2987-4-9-5"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-32-6"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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-8-9"
sodipodi:role="line"
x="3.4977415"
- y="807.20361">21</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">21</tspan></text>
</g>
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker10584)"
@@ -253,7 +253,7 @@
inkscape:connection-end="#g8678-6-4"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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 184.22792,-32.494034 -1.1e-4,31.0082104"
id="path4123-2"
inkscape:connector-type="polyline"
@@ -264,30 +264,31 @@
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: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="188.27898"
y="-68.730186"
- id="text11674"
- sodipodi:linespacing="125%"><tspan
+ id="text11674"><tspan
sodipodi:role="line"
id="tspan11676"
x="188.27898"
- y="-68.730186">obsolete, hidden</tspan></text>
+ y="-68.730186"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete, 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="229.09592"
y="4.1899796"
- id="text11678"
- sodipodi:linespacing="125%"><tspan
+ id="text11678"><tspan
sodipodi:role="line"
id="tspan11680"
x="229.09592"
- y="4.1899796">successor,</tspan><tspan
+ y="4.1899796"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">successor,</tspan><tspan
sodipodi:role="line"
x="229.09592"
y="16.68998"
- id="tspan11682">working dir</tspan></text>
+ id="tspan11682"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">working dir</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(#marker10584);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 224.96835,6.48307 c -14.81489,-0.42162 -8.84647,9.26545 -25.22395,4.58617"
diff --git a/docs/figures/figure-ug10.svg b/docs/figures/figure-ug10.svg
--- a/docs/figures/figure-ug10.svg
+++ b/docs/figures/figure-ug10.svg
@@ -13,7 +13,7 @@
height="400"
id="svg8392"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug10.svg">
<defs
id="defs8394">
@@ -264,16 +264,16 @@
id="rect2987-4"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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="3.4977415"
- y="807.20361">21</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">21</tspan></text>
</g>
<g
id="g3118"
@@ -287,16 +287,16 @@
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-72"
y="14.841505"
x="123.54487"
- 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-9"
sodipodi:role="line"
x="123.54487"
- y="14.841505">22</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">22</tspan></text>
</g>
<g
id="g3126"
@@ -310,19 +310,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-3"
y="14.841505"
x="183.42488"
- 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-0"
sodipodi:role="line"
x="183.42488"
- y="14.841505">23</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">23</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-2);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-2)"
d="m 21.981806,588.83549 38.518193,4e-5"
id="path3178"
inkscape:connector-type="polyline"
@@ -332,8 +332,8 @@
inkscape:connection-start="#g8678"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
- d="m 81.981738,588.83555 38.518072,0"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
+ d="M 81.981738,588.83555 H 120.49981"
id="path3180"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -352,16 +352,16 @@
id="rect2987-4-9"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-32"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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-8"
sodipodi:role="line"
x="3.4977415"
- y="807.20361">21</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">21</tspan></text>
</g>
<rect
style="fill:none;stroke:#000000;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999946, 3.99999785;stroke-dashoffset:0"
@@ -372,15 +372,15 @@
y="684.8089" />
<text
xml:space="preserve"
- style="font-size:11.99999428px;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="63.544647"
y="698.20331"
- id="text5217-8-72-1"
- sodipodi:linespacing="125%"><tspan
+ id="text5217-8-72-1"><tspan
y="698.20331"
x="63.544647"
sodipodi:role="line"
- id="tspan6156-9-8">22</tspan></text>
+ id="tspan6156-9-8"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">22</tspan></text>
<g
id="g3126-8"
transform="matrix(1.0000032,0,0,0.99999991,-60.000385,683.36218)">
@@ -393,19 +393,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-3-8"
y="14.841505"
x="183.42488"
- 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-0-9"
sodipodi:role="line"
x="183.42488"
- y="14.841505">23</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">23</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 21.981875,693.83548 38.518126,5e-5"
id="path3178-9"
inkscape:connector-type="polyline"
@@ -413,7 +413,7 @@
inkscape:connection-start="#g8678-6"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 81.981808,693.83554 38.518382,0"
id="path3180-1"
inkscape:connector-type="polyline"
@@ -422,47 +422,48 @@
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="7.5114212"
y="652.66315"
- id="text9295"
- sodipodi:linespacing="100%"><tspan
+ id="text9295"><tspan
sodipodi:role="line"
id="tspan9297"
x="7.5114212"
- y="652.66315">obsolete</tspan><tspan
+ y="652.66315"
+ style="font-size:10px;line-height:1;font-family:sans-serif">obsolete</tspan><tspan
sodipodi:role="line"
x="7.5114212"
y="662.66315"
- id="tspan9299">but visible</tspan></text>
+ id="tspan9299"
+ style="font-size:10px;line-height:1;font-family:sans-serif">but visible</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="155.24913"
y="668.43335"
- id="text9301"
- sodipodi:linespacing="125%"><tspan
+ id="text9301"><tspan
sodipodi:role="line"
id="tspan9303"
x="155.24913"
- y="668.43335">unstable</tspan></text>
+ y="668.43335"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">unstable</tspan></text>
<g
id="g5433"
transform="translate(32.476727,584.47248)">
<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-4">
@@ -499,38 +500,40 @@
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-72-3"
y="14.841505"
x="123.54487"
- 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-9-3"
sodipodi:role="line"
x="123.54487"
- y="14.841505">24</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">24</tspan></text>
</g>
<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="187.68906"
y="740.26349"
- id="text3218"
- sodipodi:linespacing="100%"><tspan
+ id="text3218"><tspan
sodipodi:role="line"
id="tspan3220"
x="187.68906"
- y="740.26349">working dir</tspan><tspan
+ y="740.26349"
+ style="font-size:10px;line-height:1;font-family:sans-serif">working dir</tspan><tspan
sodipodi:role="line"
x="187.68906"
y="750.26349"
- id="tspan4379">(with uncommitted</tspan><tspan
+ id="tspan4379"
+ style="font-size:10px;line-height:1;font-family:sans-serif">(with uncommitted</tspan><tspan
sodipodi:role="line"
x="187.68906"
y="760.26349"
- id="tspan4381">changes to f1 f2 ...)</tspan></text>
+ id="tspan4381"
+ style="font-size:10px;line-height:1;font-family:sans-serif">changes to f1 f2 ...)</tspan></text>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 21.981875,702.7739 38.518124,32.05414"
id="path3178-9-5"
inkscape:connector-type="polyline"
@@ -540,7 +543,7 @@
inkscape:connection-end="#g3118-2"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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.240897,702.86217 -2.2e-5,31.87761"
id="path4123"
inkscape:connector-type="polyline"
@@ -551,22 +554,23 @@
inkscape:connection-end-point="d4" />
<text
xml:space="preserve"
- 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"
x="79.694885"
y="791.03015"
id="text5217-8-0-7"
- sodipodi:linespacing="125%"
transform="scale(0.9999978,1.0000022)"><tspan
id="tspan3316"
sodipodi:role="line"
x="79.694885"
- y="791.03015">hg revert <tspan
+ y="791.03015"
+ style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg revert <tspan
id="tspan3314"
- style="font-style:italic">f1 f2 ...</tspan></tspan><tspan
+ style="font-style:italic;font-family:monospace">f1 f2 ...</tspan></tspan><tspan
id="tspan3322"
sodipodi:role="line"
x="79.694885"
- y="806.03015">hg evolve --all</tspan></text>
+ y="806.03015"
+ style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
<g
id="g6372-4-2"
transform="translate(32.179684,745.12164)">
@@ -602,15 +606,15 @@
y="793.80884" />
<text
xml:space="preserve"
- style="font-size:11.99999332px;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="3.4977415"
y="807.20361"
- id="text5217-8-32-6"
- sodipodi:linespacing="125%"><tspan
+ id="text5217-8-32-6"><tspan
y="807.20361"
x="3.4977415"
sodipodi:role="line"
- id="tspan6156-8-5">21</tspan></text>
+ id="tspan6156-8-5"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">21</tspan></text>
</g>
<rect
y="839.21106"
@@ -620,16 +624,16 @@
id="rect2987-4-02-6-9"
style="fill:none;stroke:#000000;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999946, 3.99999785;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-72-1-2"
y="852.60547"
x="63.544647"
- style="font-size:11.99999428px;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-9-8-1"
sodipodi:role="line"
x="63.544647"
- y="852.60547">22</tspan></text>
+ y="852.60547"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">22</tspan></text>
<g
id="g4295">
<rect
@@ -641,15 +645,15 @@
y="839.21106" />
<text
xml:space="preserve"
- style="font-size:11.99999428px;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="123.42475"
y="852.60547"
- id="text5217-8-3-8-6"
- sodipodi:linespacing="125%"><tspan
+ id="text5217-8-3-8-6"><tspan
y="852.60547"
x="123.42475"
sodipodi:role="line"
- id="tspan6156-0-9-3">23</tspan></text>
+ id="tspan6156-0-9-3"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">23</tspan></text>
</g>
<path
inkscape:connection-start-point="d4"
@@ -658,13 +662,13 @@
inkscape:connector-type="polyline"
id="path3178-9-1"
d="m 21.981875,848.23763 38.518124,2e-5"
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)" />
<path
inkscape:connector-curvature="0"
inkscape:connector-type="polyline"
id="path3180-1-7"
d="m 81.981809,848.23766 38.518381,3e-5"
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
inkscape:connection-end="#g4295"
inkscape:connection-end-point="d4" />
<g
@@ -679,16 +683,16 @@
y="1.4467307" />
<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="123.54487"
y="14.841505"
id="text5217-8-72-3-4"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
y="14.841505"
x="123.54487"
sodipodi:role="line"
- id="tspan6156-9-3-9">24</tspan></text>
+ id="tspan6156-9-3-9"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">24</tspan></text>
</g>
<path
inkscape:connection-end-point="d4"
@@ -699,7 +703,7 @@
inkscape:connector-type="polyline"
id="path3178-9-5-1"
d="m 21.981875,857.17605 38.518124,32.05412"
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)" />
<path
inkscape:connection-end-point="d4"
inkscape:connection-end="#g3118-2-6"
@@ -709,7 +713,7 @@
inkscape:connector-type="polyline"
id="path4123-8"
d="m 71.240897,857.26433 -2.2e-5,31.87757"
- 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);display:inline" />
+ style="display:inline;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)" />
<g
transform="translate(-1.0430814e-6,887.87361)"
id="g3118-2-6-6">
@@ -722,23 +726,23 @@
y="1.4467307" />
<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="123.54487"
y="14.841505"
id="text5217-8-72-3-4-9"
- sodipodi:linespacing="125%"
transform="scale(0.9999979,1.0000021)"><tspan
y="14.841505"
x="123.54487"
sodipodi:role="line"
- id="tspan6156-9-3-9-1">25</tspan></text>
+ id="tspan6156-9-3-9-1"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">25</tspan></text>
</g>
<path
inkscape:connector-curvature="0"
inkscape:connector-type="polyline"
id="path4123-8-2"
d="m 131.24105,857.26433 -1.4e-4,32.05601"
- 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);display:inline"
+ style="display:inline;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)"
inkscape:connection-start="#g4295"
inkscape:connection-start-point="d4"
inkscape:connection-end="#g3118-2-6-6"
@@ -748,72 +752,76 @@
inkscape:connector-type="polyline"
id="path3178-9-1-1"
d="M 81.981738,898.20048 120.5,898.31503"
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
inkscape:connection-start="#g3118-2-6"
inkscape:connection-start-point="d4"
inkscape:connection-end="#g3118-2-6-6"
inkscape:connection-end-point="d4" />
<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="187.37656"
y="909.57391"
- id="text4799-8-0"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8-0"><tspan
sodipodi:role="line"
x="187.37656"
y="909.57391"
- id="tspan4416">working dir</tspan><tspan
+ id="tspan4416"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</tspan><tspan
sodipodi:role="line"
x="187.37656"
y="922.07391"
- id="tspan4420">(clean)</tspan></text>
+ id="tspan4420"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">(clean)</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: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.91385"
y="840.83063"
- id="text4404"
- sodipodi:linespacing="100%"><tspan
+ id="text4404"><tspan
sodipodi:role="line"
id="tspan4406"
x="175.91385"
- y="840.83063">obsolete,</tspan><tspan
+ y="840.83063"
+ style="font-size:10px;line-height:1;font-family:sans-serif">obsolete,</tspan><tspan
sodipodi:role="line"
x="175.91385"
y="850.83063"
- id="tspan4408">hidden,</tspan><tspan
+ id="tspan4408"
+ style="font-size:10px;line-height:1;font-family:sans-serif">hidden,</tspan><tspan
sodipodi:role="line"
x="175.91385"
y="860.83063"
- id="tspan4410">precursors</tspan></text>
+ id="tspan4410"
+ style="font-size:10px;line-height:1;font-family:sans-serif">precursors</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: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="53.690826"
y="380.35703"
id="text4412"
- sodipodi:linespacing="100%"
transform="translate(0,559.99805)"><tspan
sodipodi:role="line"
id="tspan4414"
x="53.690826"
- y="380.35703">successors</tspan></text>
+ y="380.35703"
+ style="font-size:10px;line-height:1;font-family:sans-serif">successors</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="187.37656"
y="571.41107"
- id="text4799-8-0-8"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8-0-8"><tspan
sodipodi:role="line"
x="187.37656"
y="571.41107"
- id="tspan4416-9">working dir</tspan><tspan
+ id="tspan4416-9"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</tspan><tspan
sodipodi:role="line"
x="187.37656"
y="583.91107"
- id="tspan4420-1">(clean)</tspan></text>
+ id="tspan4420-1"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">(clean)</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;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;marker-end:url(#Arrow2Mend-2-0)"
d="M 182.62097,9.6751729 C 149.31312,5.6732792 109.12827,-5.7223311 84.489703,18.916234"
diff --git a/docs/figures/figure-ug11.svg b/docs/figures/figure-ug11.svg
--- a/docs/figures/figure-ug11.svg
+++ b/docs/figures/figure-ug11.svg
@@ -13,7 +13,7 @@
height="260"
id="svg8392"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug11.svg">
<defs
id="defs8394">
@@ -306,16 +306,16 @@
id="rect2987-4"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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="3.4977415"
- y="807.20361">25</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">25</tspan></text>
</g>
<g
id="g3118"
@@ -329,16 +329,16 @@
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-72"
y="14.841505"
x="123.54487"
- 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-9"
sodipodi:role="line"
x="123.54487"
- y="14.841505">26</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">26</tspan></text>
</g>
<g
id="g3126"
@@ -352,19 +352,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-3"
y="14.841505"
x="183.42488"
- 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-0"
sodipodi:role="line"
x="183.42488"
- y="14.841505">27</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">27</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-2);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-2)"
d="m 21.981806,580.83549 38.518193,4e-5"
id="path3178"
inkscape:connector-type="polyline"
@@ -374,8 +374,8 @@
inkscape:connection-start="#g8678"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
- d="m 81.981738,580.83555 38.518072,0"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
+ d="M 81.981738,580.83555 H 120.49981"
id="path3180"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
@@ -394,16 +394,16 @@
id="rect2987-4-9"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-32"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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-8"
sodipodi:role="line"
x="3.4977415"
- y="807.20361">25</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">25</tspan></text>
</g>
<rect
style="fill:none;stroke:#000000;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999946, 3.99999785;stroke-dashoffset:0"
@@ -414,15 +414,15 @@
y="685.14484" />
<text
xml:space="preserve"
- style="font-size:11.99999428px;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="63.544647"
y="698.53925"
- id="text5217-8-72-1"
- sodipodi:linespacing="125%"><tspan
+ id="text5217-8-72-1"><tspan
y="698.53925"
x="63.544647"
sodipodi:role="line"
- id="tspan6156-9-8">26</tspan></text>
+ id="tspan6156-9-8"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">26</tspan></text>
<g
id="g3126-8"
transform="matrix(1.0000032,0,0,0.99999991,-60.000385,683.69805)">
@@ -435,19 +435,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-3-8"
y="14.841505"
x="183.42488"
- 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-0-9"
sodipodi:role="line"
x="183.42488"
- y="14.841505">27</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">27</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 21.981875,694.17135 38.518126,5e-5"
id="path3178-9"
inkscape:connector-type="polyline"
@@ -455,7 +455,7 @@
inkscape:connection-start="#g8678-6"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 81.981808,694.17141 38.518382,0"
id="path3180-1"
inkscape:connector-type="polyline"
@@ -464,48 +464,50 @@
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="6.5114212"
y="652.66315"
- id="text9295"
- sodipodi:linespacing="100%"><tspan
+ id="text9295"><tspan
sodipodi:role="line"
id="tspan9297"
x="6.5114212"
- y="652.66315">obsolete</tspan><tspan
+ y="652.66315"
+ style="font-size:10px;line-height:1;font-family:sans-serif">obsolete</tspan><tspan
sodipodi:role="line"
x="6.5114212"
y="662.66315"
- id="tspan9299">but visible</tspan></text>
+ id="tspan9299"
+ style="font-size:10px;line-height:1;font-family:sans-serif">but visible</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="159.24913"
y="668.43335"
- id="text9301"
- sodipodi:linespacing="125%"><tspan
+ id="text9301"><tspan
sodipodi:role="line"
id="tspan9303"
x="159.24913"
- y="668.43335">unstable</tspan></text>
+ y="668.43335"
+ style="font-size:10px;line-height:1.25;font-family:sans-serif">unstable</tspan></text>
<text
xml:space="preserve"
- 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"
x="79.399506"
y="627.31293"
id="text5217-8-0"
- sodipodi:linespacing="125%"
transform="scale(0.9999978,1.0000022)"><tspan
sodipodi:role="line"
id="tspan8594"
x="79.399506"
- y="627.31293">hg uncommit <tspan
- style="font-style:italic"
+ y="627.31293"
+ style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg uncommit <tspan
+ style="font-style:italic;font-family:monospace"
id="tspan3131">f1 f2 ...</tspan></tspan><tspan
sodipodi:role="line"
x="79.399506"
y="642.31293"
- id="tspan3124">hg commit</tspan></text>
+ id="tspan3124"
+ style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg commit</tspan></text>
<g
id="g6372-4"
transform="translate(31.884309,581.4041)">
@@ -541,34 +543,35 @@
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-72-3"
y="14.841505"
x="123.54487"
- 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-9-3"
sodipodi:role="line"
x="123.54487"
- y="14.841505">28</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">28</tspan></text>
</g>
<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="187.37656"
y="781.10907"
- id="text3218"
- sodipodi:linespacing="100%"><tspan
+ id="text3218"><tspan
sodipodi:role="line"
x="187.37656"
y="781.10907"
- id="tspan4381">working dir</tspan><tspan
+ id="tspan4381"
+ style="font-size:10px;line-height:1;font-family:sans-serif">working dir</tspan><tspan
sodipodi:role="line"
x="187.37656"
y="791.10907"
- id="tspan3635">(clean)</tspan></text>
+ id="tspan3635"
+ style="font-size:10px;line-height:1;font-family:sans-serif">(clean)</tspan></text>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 21.981875,703.12214 38.518124,32.09853"
id="path3178-9-5"
inkscape:connector-type="polyline"
@@ -578,7 +581,7 @@
inkscape:connection-end="#g3118-2"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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.240897,703.1981 -2.2e-5,31.94668"
id="path4123"
inkscape:connector-type="polyline"
@@ -589,19 +592,20 @@
inkscape:connection-end-point="d4" />
<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="187.37656"
y="563.41107"
- id="text4799-8-0-8"
- sodipodi:linespacing="125%"><tspan
+ id="text4799-8-0-8"><tspan
sodipodi:role="line"
x="187.37656"
y="563.41107"
- id="tspan4416-9">working dir</tspan><tspan
+ id="tspan4416-9"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir</tspan><tspan
sodipodi:role="line"
x="187.37656"
y="575.91107"
- id="tspan4420-1">(clean)</tspan></text>
+ id="tspan4420-1"
+ style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">(clean)</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-0);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 182.62097,561.67322 c -33.30785,-4.00189 -73.4927,-15.3975 -98.131267,9.24106"
@@ -619,19 +623,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-72-3-7"
y="14.841505"
x="123.54487"
- 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-9-3-0"
sodipodi:role="line"
x="123.54487"
- y="14.841505">29</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">29</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="M 81.981738,753.12214 120.5,785.22069"
id="path3180-1-6"
inkscape:connector-type="polyline"
diff --git a/docs/figures/figure-ug12.svg b/docs/figures/figure-ug12.svg
--- a/docs/figures/figure-ug12.svg
+++ b/docs/figures/figure-ug12.svg
@@ -13,7 +13,7 @@
height="200"
id="svg3183"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="figure-ug12.svg">
<defs
id="defs3185">
@@ -324,16 +324,16 @@
transform="translate(2,-8)">
<text
transform="scale(0.9999978,1.0000022)"
- sodipodi:linespacing="125%"
id="text5217-8-0-7"
y="900.3703"
x="76.696045"
- 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="900.3703"
x="76.696045"
sodipodi:role="line"
- id="tspan3322">hg evolve --all</tspan></text>
+ id="tspan3322"
+ style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all</tspan></text>
<g
transform="translate(29.180861,844.4619)"
id="g6372-4-2">
@@ -369,16 +369,16 @@
id="rect2987-4-9"
style="fill:none;stroke:#000000;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-32"
y="807.20361"
x="3.4977415"
- style="font-size:11.99999332px;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-8"
sodipodi:role="line"
x="3.4977415"
- y="807.20361">25</tspan></text>
+ y="807.20361"
+ style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">25</tspan></text>
</g>
<rect
style="fill:none;stroke:#000000;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.99999946, 3.99999785;stroke-dashoffset:0"
@@ -389,15 +389,15 @@
y="923.8089" />
<text
xml:space="preserve"
- style="font-size:11.99999428px;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="63.544647"
y="937.20331"
- id="text5217-8-72-1"
- sodipodi:linespacing="125%"><tspan
+ id="text5217-8-72-1"><tspan
y="937.20331"
x="63.544647"
sodipodi:role="line"
- id="tspan6156-9-8">26</tspan></text>
+ id="tspan6156-9-8"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">26</tspan></text>
<g
id="g4904">
<rect
@@ -408,19 +408,19 @@
id="rect2987-4-026-7"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 4;stroke-dashoffset:0" />
<text
- sodipodi:linespacing="125%"
id="text5217-8-3-8"
y="937.20325"
x="123.42475"
- style="font-size:11.99999428px;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-0-9"
sodipodi:role="line"
x="123.42475"
- y="937.20325">27</tspan></text>
+ y="937.20325"
+ style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">27</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 21.981875,932.83543 38.518126,5e-5"
id="path3178-9"
inkscape:connector-type="polyline"
@@ -428,7 +428,7 @@
inkscape:connection-start="#g8678-6"
inkscape:connection-start-point="d4" />
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 81.981805,932.83549 38.518385,-1e-5"
id="path3180-1"
inkscape:connector-type="polyline"
@@ -447,34 +447,35 @@
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-72-3"
y="14.841505"
x="123.54487"
- 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-9-3"
sodipodi:role="line"
x="123.54487"
- y="14.841505">28</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">28</tspan></text>
</g>
<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="188.87656"
y="965.77319"
- id="text3218"
- sodipodi:linespacing="100%"><tspan
+ id="text3218"><tspan
sodipodi:role="line"
x="188.87656"
y="965.77319"
- id="tspan4381">working dir</tspan><tspan
+ id="tspan4381"
+ style="font-size:10px;line-height:1;font-family:sans-serif">working dir</tspan><tspan
sodipodi:role="line"
x="188.87656"
y="975.77319"
- id="tspan3635">(clean)</tspan></text>
+ id="tspan3635"
+ style="font-size:10px;line-height:1;font-family:sans-serif">(clean)</tspan></text>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 21.981875,941.78622 38.518124,32.09853"
id="path3178-9-5"
inkscape:connector-type="polyline"
@@ -484,7 +485,7 @@
inkscape:connection-end="#g3118-2"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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.240897,941.86217 -2.2e-5,31.94669"
id="path4123"
inkscape:connector-type="polyline"
@@ -505,19 +506,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-72-3-7"
y="14.841505"
x="123.54487"
- 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-9-3-0"
sodipodi:role="line"
x="123.54487"
- y="14.841505">29</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">29</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="M 81.981738,991.78623 120.5,1023.8848"
id="path3180-1-6"
inkscape:connector-type="polyline"
@@ -538,19 +539,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-3-8-6"
y="14.841505"
x="183.42488"
- 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-0-9-7"
sodipodi:role="line"
x="183.42488"
- y="14.841505">30</tspan></text>
+ y="14.841505"
+ style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">30</tspan></text>
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2);display:inline"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.00000155px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-2)"
d="m 81.981738,982.8355 38.518272,4e-5"
id="path3180-1-4"
inkscape:connector-type="polyline"
@@ -560,7 +561,7 @@
inkscape:connection-end="#g3126-8-4"
inkscape:connection-end-point="d4" />
<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);display:inline"
+ style="display:inline;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 131.24108,941.86211 -5e-5,31.9468"
id="path4123-8"
inkscape:connector-type="polyline"
@@ -576,20 +577,21 @@
inkscape:connector-curvature="0" />
<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"
y="154.5"
id="text5013"
- sodipodi:linespacing="100%"
transform="translate(0,852.36218)"><tspan
sodipodi:role="line"
id="tspan5015"
x="175"
- y="154.5">two heads!</tspan><tspan
+ y="154.5"
+ style="font-size:10px;line-height:1;font-family:sans-serif">two heads!</tspan><tspan
sodipodi:role="line"
x="175"
y="164.5"
- id="tspan5019">(merge or rebase)</tspan></text>
+ id="tspan5019"
+ style="font-size:10px;line-height:1;font-family:sans-serif">(merge or rebase)</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-0-5);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 170,152.5 c -16.09308,-9.35441 4.39162,-25.49226 -23.5,-23.5"
More information about the Mercurial-devel
mailing list