view docs/figures/figure-sg01-ab.svg @ 5730:a119432bafc1

divergence-resolution: deal with simple "just one moved case" earlier

While deciding the resolution parent for content-divergence resolution, now we
use 3-way merge logic to check, if only one of them was moved from its original
position by comparing the parent of both divergent cset with parent of base.

<?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="224pt" height="116pt"
 viewBox="0.00 0.00 224.00 116.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 112)">
<title>Mercurial graph</title>
<!-- 0 -->
<g id="node1" class="node">
<title>0</title>
<polygon fill="none" stroke="#000000" stroke-width="4" points="72,-108 0,-108 0,-72 72,-72 72,-108"/>
<text text-anchor="middle" x="36" y="-86.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,-108 144,-108 144,-72 216,-72 216,-108"/>
<text text-anchor="middle" x="180" y="-86.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,-90C90.9973,-90 113.9327,-90 133.8329,-90"/>
<polygon fill="#000000" stroke="#000000" stroke-width="2" points="133.9241,-93.5001 143.924,-90 133.924,-86.5001 133.9241,-93.5001"/>
</g>
<!-- T0 -->
<g id="node3" class="node">
<title>T0</title>
<text text-anchor="start" x="11" y="-15.3" font-family="mono" font-style="italic" font-size="14.00" fill="#000000">public</text>
</g>
<!-- T0&#45;&gt;0 -->
<g id="edge2" class="edge">
<title>T0&#45;&gt;0</title>
<path fill="none" stroke="#c0c0c0" stroke-width="2" d="M36,-36.1686C36,-43.869 36,-53.0257 36,-61.5834"/>
<polygon fill="#c0c0c0" stroke="#c0c0c0" stroke-width="2" points="32.5001,-61.5867 36,-71.5867 39.5001,-61.5868 32.5001,-61.5867"/>
</g>
<!-- T1 -->
<g id="node4" class="node">
<title>T1</title>
<text text-anchor="start" x="159" y="-15.3" font-family="mono" font-style="italic" font-size="14.00" fill="#000000">draft</text>
</g>
<!-- T1&#45;&gt;1 -->
<g id="edge3" class="edge">
<title>T1&#45;&gt;1</title>
<path fill="none" stroke="#c0c0c0" stroke-width="2" d="M180,-36.1686C180,-43.869 180,-53.0257 180,-61.5834"/>
<polygon fill="#c0c0c0" stroke="#c0c0c0" stroke-width="2" points="176.5001,-61.5867 180,-71.5867 183.5001,-61.5868 176.5001,-61.5867"/>
</g>
</g>
</svg>