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 Martin von Zweigbergk <martinvonz@google.com>
Mon, 09 Dec 2019 11:09:11 -0800
changeset 5343 ebfd0d875600
parent 4937 0d1893c1044c
permissions -rw-r--r--
evolve: handle relocation during divergence resolution producing no changes When resolving divergence and the two divergent commits have different parents, we start by rebasing one of them to have the same parent as the other. That step can result in no changes to commit. When it does, we would crash with a TypeError before this patch. This patch fixes it by instead creating an empty commit in that scenario. The existing code then continues to attempt to merge it, which produces no changes, and no commit is created on top. The other side of the divergence is marked as successor as usual, so orphans from the side that became empty will be evolved to the right place (see test).
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