view docs/figures/figure-sg04-b.svg @ 5561:d6b3f32f8261

evolve: add logic to decide local and other side before merge

Before we perform merge between the two content-divergent csets,
this logic decides which cset would reside at which side i.e.
local or other.
for e.g.  in case of public content divergence where one side of
divergence is public, we always keep public one to local side.
(this logic of always keeping public one to local side may change in
future, but for now that's what it is.)

<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Generated by graphviz version 2.40.1 (20161225.0304)
 -->
<!-- Title: Mercurial graph Pages: 1 -->
<svg width="427pt" height="476pt"
 viewBox="0.00 0.00 427.00 476.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 472)">
<title>Mercurial graph</title>
<!-- 0 -->
<g id="node1" class="node">
<title>0</title>
<polygon fill="none" stroke="#000000" stroke-width="4" points="72,-468 0,-468 0,-432 72,-432 72,-468"/>
<text text-anchor="middle" x="36" y="-446.3" font-family="mono" font-size="14.00" fill="#000000">0:0dc9</text>
</g>
<!-- 1 -->
<g id="node2" class="node">
<title>1</title>
<polygon fill="none" stroke="#000000" stroke-width="2" points="216,-468 144,-468 144,-432 216,-432 216,-468"/>
<text text-anchor="middle" x="180" y="-446.3" font-family="mono" font-size="14.00" fill="#000000">1:f649</text>
</g>
<!-- 0&#45;&gt;1 -->
<g id="edge1" class="edge">
<title>0&#45;&gt;1</title>
<path fill="none" stroke="#000000" stroke-width="2" d="M72.3373,-450C90.9973,-450 113.9327,-450 133.8329,-450"/>
<polygon fill="#000000" stroke="#000000" stroke-width="2" points="133.9241,-453.5001 143.924,-450 133.924,-446.5001 133.9241,-453.5001"/>
</g>
<!-- 2 -->
<g id="node3" class="node">
<title>2</title>
<polygon fill="none" stroke="#000000" stroke-width="2" points="216,-324 144,-324 144,-288 216,-288 216,-324"/>
<text text-anchor="middle" x="180" y="-302.3" font-family="mono" font-size="14.00" fill="#000000">2:96d8</text>
</g>
<!-- 0&#45;&gt;2 -->
<g id="edge2" class="edge">
<title>0&#45;&gt;2</title>
<path fill="none" stroke="#000000" stroke-width="2" d="M54.2377,-431.7623C79.6646,-406.3354 125.8747,-360.1253 154.6431,-331.3569"/>
<polygon fill="#000000" stroke="#000000" stroke-width="2" points="157.3142,-333.6356 161.9104,-324.0896 152.3644,-328.6858 157.3142,-333.6356"/>
</g>
<!-- 3 -->
<g id="node4" class="node">
<title>3</title>
<polygon fill="none" stroke="#000000" stroke-width="2" points="216,-180 144,-180 144,-144 216,-144 216,-180"/>
<text text-anchor="middle" x="180" y="-158.3" font-family="mono" font-size="14.00" fill="#000000">3:522d</text>
</g>
<!-- 0&#45;&gt;3 -->
<g id="edge3" class="edge">
<title>0&#45;&gt;3</title>
<path fill="none" stroke="#000000" stroke-width="2" d="M45.0078,-431.9843C69.5046,-382.9909 137.4407,-247.1186 166.5153,-188.9694"/>
<polygon fill="#000000" stroke="#000000" stroke-width="2" points="169.6539,-190.5184 170.9956,-180.0089 163.3929,-187.3879 169.6539,-190.5184"/>
</g>
<!-- 4 -->
<g id="node5" class="node">
<title>4</title>
<polygon fill="none" stroke="#000000" stroke-width="2" points="216,-36 144,-36 144,0 216,0 216,-36"/>
<text text-anchor="middle" x="180" y="-14.3" font-family="mono" font-size="14.00" fill="#000000">4:7b49</text>
</g>
<!-- 0&#45;&gt;4 -->
<g id="edge4" class="edge">
<title>0&#45;&gt;4</title>
<path fill="none" stroke="#000000" stroke-width="2" d="M41.1494,-431.6714C54.9755,-382.8681 94.5425,-245.8557 134,-134 144.7835,-103.4306 158.6756,-68.9686 168.3589,-45.607"/>
<polygon fill="#000000" stroke="#000000" stroke-width="2" points="171.6138,-46.8951 172.2298,-36.3182 165.1524,-44.2024 171.6138,-46.8951"/>
</g>
<!-- 1&#45;&gt;2 -->
<g id="edge5" class="edge">
<title>1&#45;&gt;2</title>
<path fill="none" stroke="#000000" stroke-width="2" stroke-dasharray="5,2" d="M180,-423.7351C180,-394.8541 180,-349.2198 180,-324.0896"/>
<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="180" cy="-427.7623" rx="4" ry="4"/>
</g>
<!-- 2&#45;&gt;3 -->
<g id="edge6" class="edge">
<title>2&#45;&gt;3</title>
<path fill="none" stroke="#000000" stroke-width="2" stroke-dasharray="5,2" d="M180,-279.7351C180,-250.8541 180,-205.2198 180,-180.0896"/>
<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="180" cy="-283.7623" rx="4" ry="4"/>
</g>
<!-- 3&#45;&gt;4 -->
<g id="edge7" class="edge">
<title>3&#45;&gt;4</title>
<path fill="none" stroke="#000000" stroke-width="2" stroke-dasharray="5,2" d="M180,-135.7351C180,-106.8541 180,-61.2198 180,-36.0896"/>
<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="180" cy="-139.7623" rx="4" ry="4"/>
</g>
<!-- T2 -->
<g id="node6" class="node">
<title>T2</title>
<text text-anchor="start" x="237" y="-231.3" font-family="mono" font-style="italic" font-size="14.00" fill="#000000">not in the other repo</text>
</g>
<!-- T2&#45;&gt;2 -->
<g id="edge8" class="edge">
<title>T2&#45;&gt;2</title>
<path fill="none" stroke="#c0c0c0" stroke-width="2" d="M287.6627,-252.1686C268.6604,-261.6698 245.2242,-273.3879 225.0748,-283.4626"/>
<polygon fill="#c0c0c0" stroke="#c0c0c0" stroke-width="2" points="223.455,-280.3593 216.076,-287.962 226.5855,-286.6203 223.455,-280.3593"/>
</g>
</g>
</svg>