# HG changeset patch # User Matt Harbison # Date 1556390568 14400 # Node ID 091eab1223a44d60a884c5522107560f669969d7 # 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 -r 30a544904238 -r 091eab1223a4 docs/figures/figure-ug01.svg --- a/docs/figures/figure-ug01.svg Thu Apr 25 15:14:21 2019 -0700 +++ b/docs/figures/figure-ug01.svg Sat Apr 27 14:42:48 2019 -0400 @@ -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"> @@ -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" /> @@ -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" /> 1 + y="13.894781" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">1 hg commit --amend + y="42.826393" + style="font-size:12px;line-height:1.25;font-family:monospace">hg commit --amend 1' + sodipodi:role="line" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">1' poof! + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">poof! (destructive, not using evolve) + y="58.872295" + style="font-size:10px;line-height:1.25;font-family:sans-serif">(destructive, not using evolve) diff -r 30a544904238 -r 091eab1223a4 docs/figures/figure-ug02.svg --- a/docs/figures/figure-ug02.svg Thu Apr 25 15:14:21 2019 -0700 +++ b/docs/figures/figure-ug02.svg Sat Apr 27 14:42:48 2019 -0400 @@ -15,7 +15,7 @@ height="250" id="svg2" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="figure-ug02.svg"> @@ -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" /> @@ -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" /> 1 + y="13.894781" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">1 3 + sodipodi:role="line" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">3 hg commit --amend + sodipodi:role="line" + style="font-size:12px;line-height:1.25;font-family:monospace">hg commit --amend (safe, using evolve) + sodipodi:role="line" + style="font-size:10px;line-height:1.25;font-family:sans-serif">(safe, using evolve) 1 + y="107.76683" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">1 + y="140.49216" + style="font-size:10px;line-height:1.25;font-family:sans-serif">  @@ -444,32 +444,31 @@ 2 + y="148.84123" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">2 T + style="font-weight:bold;font-size:8px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold'">T temporarytemporaryamendamendcommit + id="tspan4797" + style="font-size:10px;line-height:1;font-family:sans-serif">commit obsolete (and hidden) + y="112.74194" + style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete (and hidden) precursor + y="171.26965" + style="font-size:10px;line-height:1.25;font-family:sans-serif">precursor successor + y="189.68568" + style="font-size:10px;line-height:1.25;font-family:sans-serif">successor @@ -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" /> @@ -206,17 +208,16 @@ y="0.64889121" /> 3 + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif;stroke:none">3 @@ -229,39 +230,39 @@ y="0.64889765" /> 4 + id="tspan3900" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">4 + style="display:inline;fill:none;stroke:#000000;stroke-width:0.99999791px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)" /> hg prune . + sodipodi:role="line" + style="font-size:12px;line-height:1.25;font-family:monospace">hg prune . 3 @@ -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" /> 4 + y="115.1729" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">4 obsolete,obsolete,hidden,hidden,no successors + 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 working dir + y="8.7751856" + style="font-size:10px;line-height:1.25;font-family:sans-serif">working dir working dir + y="144.07831" + style="font-size:10px;line-height:1.25;font-family:sans-serif">working dir @@ -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" /> @@ -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" /> 5 + y="14.714343" + style="font-size:11.9999733px;line-height:1.25;font-family:sans-serif">5 3 + style="font-size:12px;line-height:1.25;font-family:sans-serif;stroke:none">3 6 + y="144.84122" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">6 5 + id="tspan6156-7" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">5 + y="139.74393" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">  obsolete, hidden + y="97.973274" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">obsolete, hidden precursor + y="134.52141" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">precursor successor + y="152.93744" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">successor working dir (clean) + y="14.09236" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir (clean) working dirworking dir(with uncommitted(with uncommittedchanges to f1 f2 ...) + id="tspan3135" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">changes to f1 f2 ...) hg uncommit hg uncommit f1 f2 ... + style="font-style:italic;font-family:monospace">f1 f2 ... diff -r 30a544904238 -r 091eab1223a4 docs/figures/figure-ug05.svg --- a/docs/figures/figure-ug05.svg Thu Apr 25 15:14:21 2019 -0700 +++ b/docs/figures/figure-ug05.svg Sat Apr 27 14:42:48 2019 -0400 @@ -15,7 +15,7 @@ height="250" id="svg2" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="figure-ug05.svg"> @@ -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" /> @@ -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" /> 7 + id="tspan6156" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">7 10 + sodipodi:role="line" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">10 + y="140.49216" + style="font-size:10px;line-height:1.25;font-family:sans-serif">  obsolete, hidden precursors + id="tspan4866" + style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete, hidden precursors successor, working dir + y="221.99774" + style="font-size:10px;line-height:1.25;font-family:sans-serif">successor, working dir hg fold 7 + sodipodi:role="line" + style="font-size:12px;line-height:1.25;font-family:monospace">hg fold 7 @@ -511,16 +511,16 @@ y="1.8896017" /> 8 + id="tspan6156-9" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">8 9 + id="tspan6156-0" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">9 7 + y="154.84146" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">7 @@ -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" /> 8 + y="154.84122" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">8 @@ -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" /> 9 + y="154.84122" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">9 working dir + y="45.381439" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir @@ -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" /> @@ -371,16 +373,16 @@ hg amend + y="113.7746" + style="font-size:12px;line-height:1.25;font-family:monospace">hg amend @@ -418,16 +420,15 @@ y="35.446732" /> 10 + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif;stroke:none">10 11 + id="tspan6156" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">11 15 + y="266.20969" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">15 + y="174.49216" + style="font-size:10px;line-height:1.25;font-family:sans-serif">  @@ -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" /> 12 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">12 13 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">13 working dir + y="12.367264" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir   11 + y="154.84152" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">11 12 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">12 13 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">13 obsoleteobsoletebut visible + id="tspan4452" + style="font-size:9.99999905px;line-height:1;font-family:sans-serif">but visible unstable + y="148.39902" + style="font-size:10px;line-height:1.25;font-family:sans-serif">unstable 14 + y="225.24431" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">14 T + style="font-weight:bold;font-size:8px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold'">T temporarytemporaryamendamendcommit;commit;obsolete andobsolete andhidden + id="tspan6285" + style="font-size:10px;line-height:1;font-family:sans-serif">hidden working dir + y="291.81802" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir @@ -227,16 +227,16 @@ transform="translate(0,18.65699)"> hg evolve --all + y="21.624107" + style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve --all @@ -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" /> 15 + y="150.18422" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">15 11 + y="154.84152" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">11 12 + y="88.815628" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">12 13 + y="88.815628" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">13 14 + y="225.24431" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">14 T + style="font-weight:bold;font-size:8px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold'">T   16 + sodipodi:role="line" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">16 17 + sodipodi:role="line" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">17 obsolete, hidden + y="81.810745" + style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete, hidden working dir + y="151.52931" + style="font-size:10px;line-height:1.25;font-family:sans-serif">working dir successors + y="184.34302" + style="font-size:10px;line-height:1.25;font-family:sans-serif">successors @@ -132,7 +132,7 @@ image/svg+xml - + @@ -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" /> 18 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">18 19 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">19 20 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">20 working dir + y="783.27075" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir hg prune 19 + y="851.4538" + style="font-size:12px;line-height:1.25;font-family:monospace">hg prune 19 @@ -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" /> 18 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">18 19 + id="tspan6156-9-8" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">19 @@ -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" /> 20 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">20 obsoleteobsoletebut visible + id="tspan9299" + style="font-size:10px;line-height:1.25;font-family:sans-serif">but visible unstable + y="939.66284" + style="font-size:10px;line-height:1.25;font-family:sans-serif">unstable working dir + y="920.7381" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">working dir @@ -90,7 +90,7 @@ image/svg+xml - + @@ -101,16 +101,16 @@ transform="translate(-52.986766,123.22995)"> hg evolve --all + y="-88.939552" + style="font-size:12px;line-height:1.25;font-family:monospace">hg evolve --all @@ -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" /> 18 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">18 19 + y="-149.15291" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">19 20 + y="-149.15244" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">20 21 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">21 obsolete, hidden + y="-68.730186" + style="font-size:10px;line-height:1.25;font-family:sans-serif">obsolete, hidden successor,successor,working dir + id="tspan11682" + style="font-size:10px;line-height:1.25;font-family:sans-serif">working dir @@ -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" /> 21 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">21 22 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">22 23 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">23 21 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">21 22 + id="tspan6156-9-8" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">22 @@ -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" /> 23 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">23 obsoleteobsoletebut visible + id="tspan9299" + style="font-size:10px;line-height:1;font-family:sans-serif">but visible unstable + y="668.43335" + style="font-size:10px;line-height:1.25;font-family:sans-serif">unstable hg uncommit hg uncommit f1 f2 ... + style="font-style:italic;font-family:monospace">f1 f2 ... @@ -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" /> 24 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">24 working dirworking dir(with uncommitted(with uncommittedchanges to f1 f2 ...) + id="tspan4381" + style="font-size:10px;line-height:1;font-family:sans-serif">changes to f1 f2 ...) hg revert hg revert f1 f2 ...f1 f2 ...hg evolve --all + y="806.03015" + style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all @@ -602,15 +606,15 @@ y="793.80884" /> 21 + id="tspan6156-8-5" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">21 22 + y="852.60547" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">22 23 + id="tspan6156-0-9-3" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">23 + 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)" /> 24 + id="tspan6156-9-3-9" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">24 + 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)" /> + 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)" /> @@ -722,23 +726,23 @@ y="1.4467307" /> 25 + id="tspan6156-9-3-9-1" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">25 working dirworking dir(clean) + id="tspan4420" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">(clean) obsolete,obsolete,hidden,hidden,precursors + id="tspan4410" + style="font-size:10px;line-height:1;font-family:sans-serif">precursors successors + y="380.35703" + style="font-size:10px;line-height:1;font-family:sans-serif">successors working dirworking dir(clean) + id="tspan4420-1" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">(clean) @@ -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" /> 25 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">25 26 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">26 27 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">27 25 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">25 26 + id="tspan6156-9-8" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">26 @@ -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" /> 27 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">27 obsoleteobsoletebut visible + id="tspan9299" + style="font-size:10px;line-height:1;font-family:sans-serif">but visible unstable + y="668.43335" + style="font-size:10px;line-height:1.25;font-family:sans-serif">unstable hg uncommit hg uncommit f1 f2 ...hg commit + id="tspan3124" + style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg commit @@ -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" /> 28 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">28 working dirworking dir(clean) + id="tspan3635" + style="font-size:10px;line-height:1;font-family:sans-serif">(clean) working dirworking dir(clean) + id="tspan4420-1" + style="font-size:9.99999905px;line-height:1.25;font-family:sans-serif">(clean) 29 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">29 @@ -324,16 +324,16 @@ transform="translate(2,-8)"> hg evolve --all + id="tspan3322" + style="font-size:11.99999809px;line-height:1.25;font-family:monospace">hg evolve --all @@ -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" /> 25 + y="807.20361" + style="font-size:11.99999332px;line-height:1.25;font-family:sans-serif">25 26 + id="tspan6156-9-8" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">26 27 + y="937.20325" + style="font-size:11.99999428px;line-height:1.25;font-family:sans-serif">27 28 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">28 working dirworking dir(clean) + id="tspan3635" + style="font-size:10px;line-height:1;font-family:sans-serif">(clean) 29 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">29 30 + y="14.841505" + style="font-size:11.9999752px;line-height:1.25;font-family:sans-serif">30 two heads!two heads!(merge or rebase) + id="tspan5019" + style="font-size:10px;line-height:1;font-family:sans-serif">(merge or rebase)