Mercurial > hgbook

diff en/wdir-after-commit.svg @ 115:b74102b56df5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wow! Lots more work detailing the working directory, merging, etc.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 13 Nov 2006 16:19:48 -0800
parents a0f57b3e677e
children
line wrap: on
line diff
--- a/en/wdir-after-commit.svg	Mon Nov 13 14:34:57 2006 -0800
+++ b/en/wdir-after-commit.svg	Mon Nov 13 16:19:48 2006 -0800
@@ -18,6 +18,16 @@
    sodipodi:docname="wdir-after-commit.svg">
   <defs
      id="defs5973">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6049"
+       id="linearGradient6445"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)"
+       x1="333.91171"
+       y1="488.79077"
+       x2="508.94543"
+       y2="263.79077" />
     <marker
        inkscape:stockid="Arrow1Mstart"
        orient="auto"
@@ -90,7 +100,7 @@
        xlink:href="#linearGradient6049"
        id="linearGradient6216"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-240.0462,-0.664361)"
+       gradientTransform="translate(-6.0462,-0.664361)"
        x1="333.91171"
        y1="488.79077"
        x2="508.94543"
@@ -100,7 +110,17 @@
        xlink:href="#linearGradient6049"
        id="linearGradient6232"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000474,0,0,0.790947,-11.16014,50.85693)"
+       gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)"
+       x1="333.91171"
+       y1="488.79077"
+       x2="508.94543"
+       y2="263.79077" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6049"
+       id="linearGradient6772"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)"
        x1="333.91171"
        y1="488.79077"
        x2="508.94543"
@@ -149,13 +169,14 @@
      id="layer1">
     <rect
        y="245.98355"
-       x="94.239563"
+       x="328.23956"
        height="258.57144"
        width="174.28572"
        id="rect6047"
        style="fill:url(#linearGradient6216);fill-opacity:1;stroke:#686868;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <g
-       id="g6261">
+       id="g6261"
+       transform="translate(234,0)">
       <rect
          y="258.7149"
          x="114.11369"
@@ -180,17 +201,17 @@
        id="rect5996"
        width="134.53746"
        height="44.537449"
-       x="114.11369"
+       x="348.11371"
        y="320.38159" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="138.7962"
+       x="372.7962"
        y="346.1423"
        id="text5998"><tspan
          sodipodi:role="line"
          id="tspan6000"
-         x="138.7962"
+         x="372.7962"
          y="346.1423"
          style="font-family:Courier">e7639888bb2f</tspan></text>
     <rect
@@ -198,74 +219,74 @@
        id="rect6004"
        width="134.53746"
        height="44.537449"
-       x="114.11369"
+       x="348.11371"
        y="382.04825" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="136.65421"
+       x="370.65421"
        y="407.80896"
        id="text6006"><tspan
          sodipodi:role="line"
          id="tspan6008"
-         x="136.65421"
+         x="370.65421"
          y="407.80896"
          style="font-family:Courier">7b064d8bac5e</tspan></text>
     <path
        inkscape:connector-type="polyline"
        id="path6018"
-       d="M 181.38242,303.62646 L 181.38242,320.00744"
+       d="M 415.38242,303.62646 L 415.38242,320.00744"
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" />
     <path
        inkscape:connection-end="#rect6004"
        inkscape:connector-type="polyline"
        id="path6020"
-       d="M 181.38242,365.29315 L 181.38242,381.6741"
+       d="M 415.38242,365.29315 L 415.38243,381.67412"
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" />
     <rect
        style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect6039"
        width="134.53746"
        height="44.537449"
-       x="114.11357"
+       x="348.11359"
        y="443.71487" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="138.79707"
+       x="372.79706"
        y="469.47556"
        id="text6041"><tspan
          sodipodi:role="line"
          id="tspan6043"
-         x="138.79707"
+         x="372.79706"
          y="469.47556"
          style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text>
     <path
        inkscape:connection-end="#rect6039"
        inkscape:connector-type="polyline"
        id="path6045"
-       d="M 181.38238,426.95981 L 181.38234,443.34086"
+       d="M 415.38238,426.95981 L 415.38235,443.34087"
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="93.660484"
+       x="327.66046"
        y="231.36218"
        id="text6102"><tspan
          sodipodi:role="line"
          id="tspan6104"
-         x="93.660484"
+         x="327.66046"
          y="231.36218">History in repository</tspan></text>
     <rect
        y="245.94225"
-       x="323.28415"
+       x="557.28418"
        height="204.51619"
        width="174.36833"
        id="rect6140"
        style="fill:url(#linearGradient6232);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <g
        id="g6130"
-       transform="translate(28.32541,24.38544)">
+       transform="translate(262.3254,24.38544)">
       <rect
          style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1"
          id="rect6106"
@@ -287,7 +308,7 @@
     </g>
     <g
        id="g6135"
-       transform="translate(29.03958,49.83106)">
+       transform="translate(263.0396,49.83106)">
       <rect
          inkscape:transform-center-y="102.85714"
          inkscape:transform-center-x="129.28571"
@@ -314,36 +335,36 @@
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="342.63208"
+       x="576.63208"
        y="270.479"
        id="text6118"><tspan
          sodipodi:role="line"
          id="tspan6120"
-         x="342.63208"
+         x="576.63208"
          y="270.479">First parent</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="342.07544"
+       x="576.07544"
        y="364.49615"
        id="text6122"><tspan
          sodipodi:role="line"
          id="tspan6124"
-         x="342.07544"
+         x="576.07544"
          y="364.49615">Second parent</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="322.61746"
+       x="556.61743"
        y="231.36218"
        id="text6195"><tspan
          sodipodi:role="line"
          id="tspan6197"
-         x="322.61746"
+         x="556.61743"
          y="231.36218">Parents of working directory</tspan></text>
     <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Mend)"
-       d="M 342.82543,297.63008 L 249.02528,287.95831"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 576.82542,297.63008 L 483.02528,287.95831"
        id="path6266"
        inkscape:connector-type="polyline"
        inkscape:connection-start="#g6130"
@@ -356,16 +377,16 @@
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="82.864075"
+       x="316.86407"
        y="275.6496"
        id="text6573"><tspan
          sodipodi:role="line"
          id="tspan6575"
-         x="82.864075"
+         x="316.86407"
          y="275.6496"
          style="text-align:end;text-anchor:end">New</tspan><tspan
          sodipodi:role="line"
-         x="82.864075"
+         x="316.86407"
          y="290.6496"
          id="tspan6577"
          style="text-align:end;text-anchor:end">changeset</tspan></text>