hgbook
diff en/tour-merge-sep-repos.svg @ 273:00f69e8825c5
Bring book up to date with recent changes.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Nov 26 12:24:53 2007 -0800 (2007-11-26) |
parents | 3f3dd60695cb |
children | fb5c0d56d7f1 |
line diff
1.1 --- a/en/tour-merge-sep-repos.svg Mon Oct 16 11:38:06 2006 -0700 1.2 +++ b/en/tour-merge-sep-repos.svg Mon Nov 26 12:24:53 2007 -0800 1.3 @@ -13,7 +13,7 @@ 1.4 id="svg2" 1.5 sodipodi:version="0.32" 1.6 inkscape:version="0.44.1" 1.7 - sodipodi:docname="tour-merge-repos.svg"> 1.8 + sodipodi:docname="tour-merge-sep-repos.svg"> 1.9 <defs 1.10 id="defs4"> 1.11 <marker 1.12 @@ -55,7 +55,7 @@ 1.13 inkscape:pageshadow="2" 1.14 inkscape:zoom="1.4" 1.15 inkscape:cx="307.20351" 1.16 - inkscape:cy="747.80768" 1.17 + inkscape:cy="716.87911" 1.18 inkscape:document-units="px" 1.19 inkscape:current-layer="layer1" 1.20 inkscape:window-width="906" 1.21 @@ -415,43 +415,52 @@ 1.22 y="267.12723" 1.23 style="text-align:center;text-anchor:middle" 1.24 id="tspan3132">differ</tspan></text> 1.25 + <text 1.26 + xml:space="preserve" 1.27 + style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;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.28 + x="262.15436" 1.29 + y="398.37112" 1.30 + id="text2929"><tspan 1.31 + sodipodi:role="line" 1.32 + x="262.15436" 1.33 + y="398.37112" 1.34 + id="tspan3013" 1.35 + style="text-align:start;text-anchor:start">common history</tspan></text> 1.36 <g 1.37 - id="g3122" 1.38 + id="g3107" 1.39 transform="translate(0,0.855744)"> 1.40 - <text 1.41 - id="text2929" 1.42 - y="397.51538" 1.43 - x="262.15436" 1.44 - style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;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.45 - xml:space="preserve"><tspan 1.46 - style="text-align:start;text-anchor:start" 1.47 - id="tspan3013" 1.48 - y="397.51538" 1.49 - x="262.15436" 1.50 - sodipodi:role="line">common history</tspan></text> 1.51 - <g 1.52 - id="g3107"> 1.53 - <path 1.54 - style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 1.55 - d="M 300.35713,381.29075 L 300.35713,304.50504" 1.56 - id="path3101" /> 1.57 - <path 1.58 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.59 - d="M 291.07142,301.64789 L 309.28571,301.64789" 1.60 - id="path3105" /> 1.61 - </g> 1.62 - <g 1.63 - transform="matrix(1,0,0,-1,0.178583,789.2886)" 1.64 - id="g3111"> 1.65 - <path 1.66 - style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 1.67 - d="M 300.35713,381.29075 L 300.35713,304.50504" 1.68 - id="path3113" /> 1.69 - <path 1.70 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.71 - d="M 291.07142,301.64789 L 309.28571,301.64789" 1.72 - id="path3115" /> 1.73 - </g> 1.74 + <path 1.75 + id="path3101" 1.76 + d="M 300.35713,381.29075 L 300.35713,304.50504" 1.77 + style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" /> 1.78 + <path 1.79 + id="path3105" 1.80 + d="M 291.07142,301.64789 L 309.28571,301.64789" 1.81 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 1.82 </g> 1.83 + <path 1.84 + style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 1.85 + d="M 300.53571,486.38926 L 300.53571,409.60355" 1.86 + id="path3113" /> 1.87 + <path 1.88 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.89 + d="M 291.25,488.49641 L 309.46429,488.49641" 1.90 + id="path3115" /> 1.91 + <text 1.92 + xml:space="preserve" 1.93 + 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.94 + x="480.71429" 1.95 + y="250.91507" 1.96 + id="text1949"><tspan 1.97 + sodipodi:role="line" 1.98 + id="tspan1951" 1.99 + x="480.71429" 1.100 + y="250.91507" 1.101 + style="text-align:start;text-anchor:start">head revision</tspan><tspan 1.102 + sodipodi:role="line" 1.103 + x="480.71429" 1.104 + y="265.91507" 1.105 + id="tspan1953" 1.106 + style="text-align:start;text-anchor:start">(has no children)</tspan></text> 1.107 </g> 1.108 </svg>