Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs/figures/figure-sg05.svg
author Sushil khanchi <sushilkhanchi97@gmail.com>
Sat, 23 Nov 2019 16:17:04 +0530
branchstable
changeset 4991 2928f35023a1
parent 4937 0d1893c1044c
permissions -rw-r--r--
evolve: make sure divergence resolution doesn't undo changes (issue6203) Before this patch, in content-divergence resolution logic if resolution parent is not the parent of any of the two divergent changesets then it could undo some changes introduced by previous revs (while resolving stack of content-divergent changesets) as demonstrated by the test added in previous patch. To solve this, what this patch doing is: if divergent cset has obsolete parent with a successor then first resolve the "orphan" instability of divergent cset by relocating, then perform the content-divergence resolution. After this change in logic, I found that it's kind of more correct as reflected by the changes in tests/test-evolve-content-divergent-corner-cases.t where it prevented creating conflicts while merging. Changes in tests/test-evolve-content-divergent-stack.t demonstrate the fixed behaviour. Next patches will be covering the `evolve --continue` case for the relocation of "divergent" cset.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4937
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     1
 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     2
 
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     3
 
 "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     4
 
<!-- Generated by graphviz version 2.40.1 (20161225.0304)
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     5
 
 -->
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     6
 
<!-- Title: Mercurial graph Pages: 1 -->
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     7
 
<svg width="224pt" height="116pt"
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     8
 
 viewBox="0.00 0.00 224.00 116.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
     9
 
<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 112)">
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    10
 
<title>Mercurial graph</title>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    11
 
<!-- 0 -->
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    12
 
<g id="node1" class="node">
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    13
 
<title>0</title>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    14
 
<polygon fill="none" stroke="#000000" stroke-width="4" points="72,-108 0,-108 0,-72 72,-72 72,-108"/>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    15
 
<text text-anchor="middle" x="36" y="-86.3" font-family="mono" font-size="14.00" fill="#000000">0:0dc9</text>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    16
 
</g>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    17
 
<!-- 1 -->
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    18
 
<g id="node2" class="node">
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    19
 
<title>1</title>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    20
 
<polygon fill="none" stroke="#000000" stroke-width="4" points="216,-108 144,-108 144,-72 216,-72 216,-108"/>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    21
 
<text text-anchor="middle" x="180" y="-86.3" font-family="mono" font-size="14.00" fill="#000000">1:7b49</text>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    22
 
</g>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    23
 
<!-- 0&#45;&gt;1 -->
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    24
 
<g id="edge1" class="edge">
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    25
 
<title>0&#45;&gt;1</title>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    26
 
<path fill="none" stroke="#000000" stroke-width="2" d="M72.3373,-90C90.9973,-90 113.9327,-90 133.8329,-90"/>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    27
 
<polygon fill="#000000" stroke="#000000" stroke-width="2" points="133.9241,-93.5001 143.924,-90 133.924,-86.5001 133.9241,-93.5001"/>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    28
 
</g>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    29
 
<!-- T1 -->
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    30
 
<g id="node3" class="node">
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    31
 
<title>T1</title>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    32
 
<text text-anchor="start" x="17" y="-15.3" font-family="mono" font-style="italic" font-size="14.00" fill="#000000">only the final version</text>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    33
 
</g>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    34
 
<!-- T1&#45;&gt;1 -->
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    35
 
<g id="edge2" class="edge">
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    36
 
<title>T1&#45;&gt;1</title>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    37
 
<path fill="none" stroke="#c0c0c0" stroke-width="2" d="M126.1686,-36.1686C134.7152,-44.7152 145.0557,-55.0557 154.3802,-64.3802"/>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    38
 
<polygon fill="#c0c0c0" stroke="#c0c0c0" stroke-width="2" points="152.0408,-66.9905 161.5867,-71.5867 156.9905,-62.0408 152.0408,-66.9905"/>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    39
 
</g>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    40
 
</g>
0d1893c1044c docs: add SVG figures for sharing.rst
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset 
    41
 
</svg>
evolve