view es/tour-merge-sep-repos.svg @ 593:f89480678965

translated section 13.7

<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="744.09448819"
   height="1052.3622047"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   sodipodi:docname="tour-merge-sep-repos.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape">
  <defs
     id="defs4">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective3067" />
    <marker
       inkscape:stockid="Arrow1Mstart"
       orient="auto"
       refY="0.0"
       refX="0.0"
       id="Arrow1Mstart"
       style="overflow:visible">
      <path
         id="path2973"
         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
         transform="scale(0.4) translate(10,0)" />
    </marker>
    <marker
       inkscape:stockid="Arrow1Mend"
       orient="auto"
       refY="0.0"
       refX="0.0"
       id="Arrow1Mend"
       style="overflow:visible;">
      <path
         id="path3066"
         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
         transform="scale(0.4) rotate(180) translate(10,0)" />
    </marker>
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     gridtolerance="10000"
     guidetolerance="10"
     objecttolerance="10"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1.4"
     inkscape:cx="307.20351"
     inkscape:cy="683.39831"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     inkscape:window-width="906"
     inkscape:window-height="659"
     inkscape:window-x="5"
     inkscape:window-y="49"
     showgrid="false" />
  <metadata
     id="metadata7">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1">
    <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:Courier"
       x="173.57143"
       y="443.79074"
       id="text2832"><tspan
         sodipodi:role="line"
         id="tspan2834"
         x="173.57143"
         y="443.79074" /></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect1878"
       width="94.285713"
       height="20.714285"
       x="138"
       y="479.50504" />
    <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:Courier"
       x="162.09892"
       y="493.12619"
       id="text1872"><tspan
         sodipodi:role="line"
         id="tspan1874"
         x="162.09892"
         y="493.12619"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan1876">0</tspan>: REV0</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2800"
       width="94.285713"
       height="20.714285"
       x="138"
       y="432.63004" />
    <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:Courier"
       x="162.09892"
       y="446.25119"
       id="text2794"><tspan
         sodipodi:role="line"
         id="tspan2796"
         x="162.09892"
         y="446.25119"
         style="font-family:Courier"><tspan
   id="tspan2868"
   style="font-weight:bold">1</tspan>: REV1</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2810"
       width="94.285713"
       height="20.714285"
       x="138"
       y="385.75504" />
    <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:Courier"
       x="162.09892"
       y="399.37619"
       id="text2804"><tspan
         sodipodi:role="line"
         id="tspan2806"
         x="162.09892"
         y="399.37619"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2866">2</tspan>: REV2</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2820"
       width="94.285713"
       height="20.714285"
       x="138"
       y="338.88007" />
    <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:Courier"
       x="162.09892"
       y="352.50122"
       id="text2814"><tspan
         sodipodi:role="line"
         id="tspan2816"
         x="162.09892"
         y="352.50122"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2864">3</tspan>: REV3</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2830"
       width="94.285713"
       height="20.714285"
       x="138"
       y="292.00504" />
    <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:Courier"
       x="162.09892"
       y="305.62619"
       id="text2824"><tspan
         sodipodi:role="line"
         id="tspan2826"
         x="162.09892"
         y="305.62619"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2862">4</tspan>: REV4</tspan></text>
    <path
       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"
       d="M 185.14286,478.50504 L 185.14286,454.34432"
       id="path2894"
       inkscape:connector-type="polyline" />
    <path
       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"
       d="M 185.14286,431.63004 L 185.14286,407.46932"
       id="path2896"
       inkscape:connector-type="polyline" />
    <path
       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"
       d="M 185.14286,384.75504 L 185.14286,360.59435"
       id="path2898"
       inkscape:connector-type="polyline" />
    <path
       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"
       d="M 185.14286,337.88007 L 185.14286,313.71932"
       id="path2900"
       inkscape:connector-type="polyline" />
    <rect
       style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect1963"
       width="94.285995"
       height="20.714283"
       x="138"
       y="245.18723" />
    <text
       xml:space="preserve"
       style="font-size:12.00001812px;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:Courier"
       x="162.09877"
       y="258.80865"
       id="text1965"
       transform="scale(1.000002,0.999998)"><tspan
         sodipodi:role="line"
         id="tspan1967"
         x="162.09877"
         y="258.80865"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan1973">5</tspan>: REV_my_hello</tspan></text>
    <path
       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
       d="M 185.143,291.06218 L 185.143,266.90143"
       id="path1971"
       inkscape:connector-type="polyline" />
    <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.90039"
       y="232.25546"
       id="text2921"><tspan
         sodipodi:role="line"
         id="tspan2923"
         x="136.90039"
         y="232.25546">my-hello</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2863"
       width="94.285713"
       height="20.714285"
       x="370.71414"
       y="479.49289" />
    <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:Courier"
       x="394.81305"
       y="493.11404"
       id="text2865"><tspan
         sodipodi:role="line"
         id="tspan2867"
         x="394.81305"
         y="493.11404"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2869">0</tspan>: REV0</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2871"
       width="94.285713"
       height="20.714285"
       x="370.71414"
       y="432.61789" />
    <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:Courier"
       x="394.81305"
       y="446.23904"
       id="text2873"><tspan
         sodipodi:role="line"
         id="tspan2875"
         x="394.81305"
         y="446.23904"
         style="font-family:Courier"><tspan
   id="tspan2877"
   style="font-weight:bold">1</tspan>: REV1</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2879"
       width="94.285713"
       height="20.714285"
       x="370.71414"
       y="385.74289" />
    <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:Courier"
       x="394.81305"
       y="399.36404"
       id="text2881"><tspan
         sodipodi:role="line"
         id="tspan2883"
         x="394.81305"
         y="399.36404"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2885">2</tspan>: REV2</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2887"
       width="94.285713"
       height="20.714285"
       x="370.71414"
       y="338.86792" />
    <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:Courier"
       x="394.81305"
       y="352.48907"
       id="text2889"><tspan
         sodipodi:role="line"
         id="tspan2891"
         x="394.81305"
         y="352.48907"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2893">3</tspan>: REV3</tspan></text>
    <rect
       style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2895"
       width="94.285713"
       height="20.714285"
       x="370.71414"
       y="291.99289" />
    <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:Courier"
       x="394.81305"
       y="305.61404"
       id="text2897"><tspan
         sodipodi:role="line"
         id="tspan2899"
         x="394.81305"
         y="305.61404"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2901">4</tspan>: REV4</tspan></text>
    <path
       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"
       d="M 417.85701,478.4929 L 417.85701,454.33218"
       id="path2903"
       inkscape:connector-type="polyline" />
    <path
       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"
       d="M 417.85701,431.6179 L 417.85701,407.45718"
       id="path2905"
       inkscape:connector-type="polyline" />
    <path
       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"
       d="M 417.85701,384.7429 L 417.85701,360.58221"
       id="path2907"
       inkscape:connector-type="polyline" />
    <path
       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"
       d="M 417.85701,337.86793 L 417.85701,313.70718"
       id="path2909"
       inkscape:connector-type="polyline" />
    <rect
       style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect2911"
       width="94.285995"
       height="20.714283"
       x="370.71414"
       y="245.17511" />
    <text
       xml:space="preserve"
       style="font-size:12.00001812px;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:Courier"
       x="394.81274"
       y="258.79678"
       id="text2913"
       transform="scale(1.000002,0.999998)"><tspan
         sodipodi:role="line"
         id="tspan2915"
         x="394.81274"
         y="258.79678"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2917">5</tspan>: REV_my_new_hello</tspan></text>
    <path
       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
       d="M 417.85715,291.05004 L 417.85715,266.88929"
       id="path2919"
       inkscape:connector-type="polyline" />
    <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="369.61453"
       y="232.25546"
       id="text2925"><tspan
         sodipodi:role="line"
         id="tspan2927"
         x="369.61453"
         y="232.25546">my-new-hello</tspan></text>
    <text
       xml:space="preserve"
       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
       x="300.54352"
       y="252.12723"
       id="text2933"><tspan
         sodipodi:role="line"
         id="tspan2935"
         x="300.54352"
         y="252.12723"
         style="text-align:center;text-anchor:middle">Los cambios</tspan><tspan
         sodipodi:role="line"
         x="300.54352"
         y="267.12723"
         style="text-align:center;text-anchor:middle"
         id="tspan3494">más recientes</tspan><tspan
         sodipodi:role="line"
         x="300.54352"
         y="282.12723"
         style="text-align:center;text-anchor:middle"
         id="tspan3132">difieren</tspan></text>
    <text
       xml:space="preserve"
       style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
       x="262.15436"
       y="398.37112"
       id="text2929"><tspan
         sodipodi:role="line"
         x="262.15436"
         y="398.37112"
         id="tspan3013"
         style="text-align:start;text-anchor:start">historia común</tspan></text>
    <g
       id="g3107"
       transform="translate(0,0.855744)">
      <path
         id="path3101"
         d="M 300.35713,381.29075 L 300.35713,304.50504"
         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" />
      <path
         id="path3105"
         d="M 291.07142,301.64789 L 309.28571,301.64789"
         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" />
    </g>
    <path
       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"
       d="M 300.53571,486.38926 L 300.53571,409.60355"
       id="path3113" />
    <path
       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"
       d="M 291.25,488.49641 L 309.46429,488.49641"
       id="path3115" />
    <text
       xml:space="preserve"
       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
       x="480.71429"
       y="250.91507"
       id="text1949"><tspan
         sodipodi:role="line"
         id="tspan1951"
         x="480.71429"
         y="250.91507"
         style="text-align:start;text-anchor:start">revisión principal</tspan><tspan
         sodipodi:role="line"
         x="480.71429"
         y="265.91507"
         id="tspan1953"
         style="text-align:start;text-anchor:start">     (sin hijos)</tspan></text>
  </g>
</svg>