hgbook
diff en/wdir-after-commit.svg @ 464:951bf84ca8e2
translated up to the section "testing and troubleshooting"
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Tue Dec 23 18:57:35 2008 -0500 (2008-12-23) |
parents | a0f57b3e677e |
children |
line diff
1.1 --- a/en/wdir-after-commit.svg Mon Nov 13 14:32:16 2006 -0800 1.2 +++ b/en/wdir-after-commit.svg Tue Dec 23 18:57:35 2008 -0500 1.3 @@ -18,6 +18,16 @@ 1.4 sodipodi:docname="wdir-after-commit.svg"> 1.5 <defs 1.6 id="defs5973"> 1.7 + <linearGradient 1.8 + inkscape:collect="always" 1.9 + xlink:href="#linearGradient6049" 1.10 + id="linearGradient6445" 1.11 + gradientUnits="userSpaceOnUse" 1.12 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 1.13 + x1="333.91171" 1.14 + y1="488.79077" 1.15 + x2="508.94543" 1.16 + y2="263.79077" /> 1.17 <marker 1.18 inkscape:stockid="Arrow1Mstart" 1.19 orient="auto" 1.20 @@ -90,7 +100,7 @@ 1.21 xlink:href="#linearGradient6049" 1.22 id="linearGradient6216" 1.23 gradientUnits="userSpaceOnUse" 1.24 - gradientTransform="translate(-240.0462,-0.664361)" 1.25 + gradientTransform="translate(-6.0462,-0.664361)" 1.26 x1="333.91171" 1.27 y1="488.79077" 1.28 x2="508.94543" 1.29 @@ -100,7 +110,17 @@ 1.30 xlink:href="#linearGradient6049" 1.31 id="linearGradient6232" 1.32 gradientUnits="userSpaceOnUse" 1.33 - gradientTransform="matrix(1.000474,0,0,0.790947,-11.16014,50.85693)" 1.34 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 1.35 + x1="333.91171" 1.36 + y1="488.79077" 1.37 + x2="508.94543" 1.38 + y2="263.79077" /> 1.39 + <linearGradient 1.40 + inkscape:collect="always" 1.41 + xlink:href="#linearGradient6049" 1.42 + id="linearGradient6772" 1.43 + gradientUnits="userSpaceOnUse" 1.44 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 1.45 x1="333.91171" 1.46 y1="488.79077" 1.47 x2="508.94543" 1.48 @@ -149,13 +169,14 @@ 1.49 id="layer1"> 1.50 <rect 1.51 y="245.98355" 1.52 - x="94.239563" 1.53 + x="328.23956" 1.54 height="258.57144" 1.55 width="174.28572" 1.56 id="rect6047" 1.57 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" /> 1.58 <g 1.59 - id="g6261"> 1.60 + id="g6261" 1.61 + transform="translate(234,0)"> 1.62 <rect 1.63 y="258.7149" 1.64 x="114.11369" 1.65 @@ -180,17 +201,17 @@ 1.66 id="rect5996" 1.67 width="134.53746" 1.68 height="44.537449" 1.69 - x="114.11369" 1.70 + x="348.11371" 1.71 y="320.38159" /> 1.72 <text 1.73 xml:space="preserve" 1.74 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" 1.75 - x="138.7962" 1.76 + x="372.7962" 1.77 y="346.1423" 1.78 id="text5998"><tspan 1.79 sodipodi:role="line" 1.80 id="tspan6000" 1.81 - x="138.7962" 1.82 + x="372.7962" 1.83 y="346.1423" 1.84 style="font-family:Courier">e7639888bb2f</tspan></text> 1.85 <rect 1.86 @@ -198,74 +219,74 @@ 1.87 id="rect6004" 1.88 width="134.53746" 1.89 height="44.537449" 1.90 - x="114.11369" 1.91 + x="348.11371" 1.92 y="382.04825" /> 1.93 <text 1.94 xml:space="preserve" 1.95 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" 1.96 - x="136.65421" 1.97 + x="370.65421" 1.98 y="407.80896" 1.99 id="text6006"><tspan 1.100 sodipodi:role="line" 1.101 id="tspan6008" 1.102 - x="136.65421" 1.103 + x="370.65421" 1.104 y="407.80896" 1.105 style="font-family:Courier">7b064d8bac5e</tspan></text> 1.106 <path 1.107 inkscape:connector-type="polyline" 1.108 id="path6018" 1.109 - d="M 181.38242,303.62646 L 181.38242,320.00744" 1.110 + d="M 415.38242,303.62646 L 415.38242,320.00744" 1.111 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" /> 1.112 <path 1.113 inkscape:connection-end="#rect6004" 1.114 inkscape:connector-type="polyline" 1.115 id="path6020" 1.116 - d="M 181.38242,365.29315 L 181.38242,381.6741" 1.117 + d="M 415.38242,365.29315 L 415.38243,381.67412" 1.118 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" /> 1.119 <rect 1.120 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" 1.121 id="rect6039" 1.122 width="134.53746" 1.123 height="44.537449" 1.124 - x="114.11357" 1.125 + x="348.11359" 1.126 y="443.71487" /> 1.127 <text 1.128 xml:space="preserve" 1.129 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" 1.130 - x="138.79707" 1.131 + x="372.79706" 1.132 y="469.47556" 1.133 id="text6041"><tspan 1.134 sodipodi:role="line" 1.135 id="tspan6043" 1.136 - x="138.79707" 1.137 + x="372.79706" 1.138 y="469.47556" 1.139 style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 1.140 <path 1.141 inkscape:connection-end="#rect6039" 1.142 inkscape:connector-type="polyline" 1.143 id="path6045" 1.144 - d="M 181.38238,426.95981 L 181.38234,443.34086" 1.145 + d="M 415.38238,426.95981 L 415.38235,443.34087" 1.146 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" /> 1.147 <text 1.148 xml:space="preserve" 1.149 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" 1.150 - x="93.660484" 1.151 + x="327.66046" 1.152 y="231.36218" 1.153 id="text6102"><tspan 1.154 sodipodi:role="line" 1.155 id="tspan6104" 1.156 - x="93.660484" 1.157 + x="327.66046" 1.158 y="231.36218">History in repository</tspan></text> 1.159 <rect 1.160 y="245.94225" 1.161 - x="323.28415" 1.162 + x="557.28418" 1.163 height="204.51619" 1.164 width="174.36833" 1.165 id="rect6140" 1.166 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" /> 1.167 <g 1.168 id="g6130" 1.169 - transform="translate(28.32541,24.38544)"> 1.170 + transform="translate(262.3254,24.38544)"> 1.171 <rect 1.172 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" 1.173 id="rect6106" 1.174 @@ -287,7 +308,7 @@ 1.175 </g> 1.176 <g 1.177 id="g6135" 1.178 - transform="translate(29.03958,49.83106)"> 1.179 + transform="translate(263.0396,49.83106)"> 1.180 <rect 1.181 inkscape:transform-center-y="102.85714" 1.182 inkscape:transform-center-x="129.28571" 1.183 @@ -314,36 +335,36 @@ 1.184 <text 1.185 xml:space="preserve" 1.186 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" 1.187 - x="342.63208" 1.188 + x="576.63208" 1.189 y="270.479" 1.190 id="text6118"><tspan 1.191 sodipodi:role="line" 1.192 id="tspan6120" 1.193 - x="342.63208" 1.194 + x="576.63208" 1.195 y="270.479">First parent</tspan></text> 1.196 <text 1.197 xml:space="preserve" 1.198 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" 1.199 - x="342.07544" 1.200 + x="576.07544" 1.201 y="364.49615" 1.202 id="text6122"><tspan 1.203 sodipodi:role="line" 1.204 id="tspan6124" 1.205 - x="342.07544" 1.206 + x="576.07544" 1.207 y="364.49615">Second parent</tspan></text> 1.208 <text 1.209 xml:space="preserve" 1.210 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" 1.211 - x="322.61746" 1.212 + x="556.61743" 1.213 y="231.36218" 1.214 id="text6195"><tspan 1.215 sodipodi:role="line" 1.216 id="tspan6197" 1.217 - x="322.61746" 1.218 + x="556.61743" 1.219 y="231.36218">Parents of working directory</tspan></text> 1.220 <path 1.221 - 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)" 1.222 - d="M 342.82543,297.63008 L 249.02528,287.95831" 1.223 + 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" 1.224 + d="M 576.82542,297.63008 L 483.02528,287.95831" 1.225 id="path6266" 1.226 inkscape:connector-type="polyline" 1.227 inkscape:connection-start="#g6130" 1.228 @@ -356,16 +377,16 @@ 1.229 <text 1.230 xml:space="preserve" 1.231 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" 1.232 - x="82.864075" 1.233 + x="316.86407" 1.234 y="275.6496" 1.235 id="text6573"><tspan 1.236 sodipodi:role="line" 1.237 id="tspan6575" 1.238 - x="82.864075" 1.239 + x="316.86407" 1.240 y="275.6496" 1.241 style="text-align:end;text-anchor:end">New</tspan><tspan 1.242 sodipodi:role="line" 1.243 - x="82.864075" 1.244 + x="316.86407" 1.245 y="290.6496" 1.246 id="tspan6577" 1.247 style="text-align:end;text-anchor:end">changeset</tspan></text>