Mercurial > evolve
changeset 3442:7ac98f83ae6d mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 20 Jan 2018 12:38:11 +0100 |
| parents | fc2dd881297b (diff) 98e889782c86 (current diff) |
| children | b92114f201c9 |
| files | tests/test-topic-tutorial.t |
| diffstat | 5 files changed, 450 insertions(+), 450 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Sat Jan 20 12:28:53 2018 +0100 +++ b/CHANGELOG Sat Jan 20 12:38:11 2018 +0100 @@ -1,7 +1,7 @@ Changelog ========= -7.2.1 - in progress +7.2.1 --2018-01-20 ------------------- * compatibility with future Mercurial 4.5
--- a/debian/changelog Sat Jan 20 12:28:53 2018 +0100 +++ b/debian/changelog Sat Jan 20 12:38:11 2018 +0100 @@ -1,8 +1,8 @@ -mercurial-evolve (7.2.0) UNRELEASED; urgency=medium +mercurial-evolve (7.2.1-1) unstable; urgency=medium * new upstream release - -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Mon, 15 Jan 2018 21:44:57 +0100 + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sat, 20 Jan 2018 12:28:16 +0100 mercurial-evolve (7.1.0-1) unstable; urgency=medium
--- a/hgext3rd/evolve/metadata.py Sat Jan 20 12:28:53 2018 +0100 +++ b/hgext3rd/evolve/metadata.py Sat Jan 20 12:38:11 2018 +0100 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = '7.2.1.dev' +__version__ = '7.2.1' testedwith = '4.1.3 4.2.3 4.3.2 4.4.2' minimumhgversion = '4.1' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Sat Jan 20 12:28:53 2018 +0100 +++ b/hgext3rd/topic/__init__.py Sat Jan 20 12:38:11 2018 +0100 @@ -175,7 +175,7 @@ 'topic.active': 'green', } -__version__ = '0.7.1.dev' +__version__ = '0.7.0' testedwith = '4.1.3 4.2.3 4.3.3 4.4.2' minimumhgversion = '4.1'
--- a/tests/test-topic-tutorial.t Sat Jan 20 12:28:53 2018 +0100 +++ b/tests/test-topic-tutorial.t Sat Jan 20 12:38:11 2018 +0100 @@ -910,140 +910,140 @@ .. graphviz:: strict digraph "Mercurial graph" { - graph [rankdir=LR, - splines=polyline - ]; - node [label="\N"]; - 0 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=0, - pin=true, - pos="1,0!", - shape=circle, - style=filled, - width=1]; - 3 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=3, - pin=true, - pos="1,3!", - shape=circle, - style=filled, - width=1]; - 0 -> 3 [arrowhead=none, - penwidth=2.0]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 3 -> 4 [arrowhead=none, - penwidth=2.0]; - 5 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=5, - pin=true, - pos="1,5!", - shape=circle, - style=filled, - width=1]; - 4 -> 5 [arrowhead=none, - penwidth=2.0]; - 6 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=6, - pin=true, - pos="1,6!", - shape=pentagon, - style=filled, - width=1]; - 5 -> 6 [arrowhead=none, - penwidth=2.0]; - 9 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=9, - pin=true, - pos="1,9!", - shape=pentagon, - style=filled, - width=1]; - 5 -> 9 [arrowhead=none, - penwidth=2.0]; - 11 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=11, - pin=true, - pos="1,11!", - shape=circle, - style=filled, - width=1]; - 5 -> 11 [arrowhead=none, - penwidth=2.0]; - 7 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=7, - pin=true, - pos="1,7!", - shape=pentagon, - style=filled, - width=1]; - 6 -> 7 [arrowhead=none, - penwidth=2.0]; - 8 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=8, - pin=true, - pos="1,8!", - shape=pentagon, - style=filled, - width=1]; - 7 -> 8 [arrowhead=none, - penwidth=2.0]; - 10 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=10, - pin=true, - pos="1,10!", - shape=pentagon, - style=filled, - width=1]; - 9 -> 10 [arrowhead=none, - penwidth=2.0]; - 12 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=12, - pin=true, - pos="1,12!", - shape=circle, - style=filled, - width=1]; - 11 -> 12 [arrowhead=none, - penwidth=2.0]; + graph [rankdir=LR, + splines=polyline + ]; + node [label="\N"]; + 0 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=0, + pin=true, + pos="1,0!", + shape=circle, + style=filled, + width=1]; + 3 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=3, + pin=true, + pos="1,3!", + shape=circle, + style=filled, + width=1]; + 0 -> 3 [arrowhead=none, + penwidth=2.0]; + 4 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=4, + pin=true, + pos="1,4!", + shape=circle, + style=filled, + width=1]; + 3 -> 4 [arrowhead=none, + penwidth=2.0]; + 5 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=5, + pin=true, + pos="1,5!", + shape=circle, + style=filled, + width=1]; + 4 -> 5 [arrowhead=none, + penwidth=2.0]; + 6 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=6, + pin=true, + pos="1,6!", + shape=pentagon, + style=filled, + width=1]; + 5 -> 6 [arrowhead=none, + penwidth=2.0]; + 9 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=9, + pin=true, + pos="1,9!", + shape=pentagon, + style=filled, + width=1]; + 5 -> 9 [arrowhead=none, + penwidth=2.0]; + 11 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=11, + pin=true, + pos="1,11!", + shape=circle, + style=filled, + width=1]; + 5 -> 11 [arrowhead=none, + penwidth=2.0]; + 7 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=7, + pin=true, + pos="1,7!", + shape=pentagon, + style=filled, + width=1]; + 6 -> 7 [arrowhead=none, + penwidth=2.0]; + 8 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=8, + pin=true, + pos="1,8!", + shape=pentagon, + style=filled, + width=1]; + 7 -> 8 [arrowhead=none, + penwidth=2.0]; + 10 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=10, + pin=true, + pos="1,10!", + shape=pentagon, + style=filled, + width=1]; + 9 -> 10 [arrowhead=none, + penwidth=2.0]; + 12 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=12, + pin=true, + pos="1,12!", + shape=circle, + style=filled, + width=1]; + 11 -> 12 [arrowhead=none, + penwidth=2.0]; } #endif @@ -1252,97 +1252,97 @@ .. graphviz:: strict digraph "Mercurial graph" { - graph [rankdir=LR, - splines=polyline - ]; - node [label="\N"]; - 12 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=12, - pin=true, - pos="1,12!", - shape=circle, - style=filled, - width=1]; - 13 [fillcolor="#DFDFFF", - fixedsize=true, - group=default_alt, - height=1, - label=13, - pin=true, - pos="2,13!", - shape=pentagon, - style="dotted, filled", - width=1]; - 12 -> 13 [arrowhead=none, - penwidth=2.0]; - 18 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=18, - pin=true, - pos="1,18!", - shape=pentagon, - style=filled, - width=1]; - 12 -> 18 [arrowhead=none, - penwidth=2.0]; - 16 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=16, - pin=true, - pos="1,16!", - shape=circle, - style=filled, - width=1]; - 12 -> 16 [arrowhead=none, - penwidth=2.0]; - 13 -> 18 [arrowtail=none, - dir=back, - minlen=0, - penwidth=2.0, - style=dashed]; - 14 [fillcolor="#FF4F4F", - fixedsize=true, - group=default_alt, - height=1, - label=14, - pin=true, - pos="2,14!", - shape=pentagon, - style=filled, - width=1]; - 13 -> 14 [arrowhead=none, - penwidth=2.0]; - 15 [fillcolor="#FF4F4F", - fixedsize=true, - group=default_alt, - height=1, - label=15, - pin=true, - pos="2,15!", - shape=pentagon, - style=filled, - width=1]; - 14 -> 15 [arrowhead=none, - penwidth=2.0]; - 17 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=17, - pin=true, - pos="1,17!", - shape=circle, - style=filled, - width=1]; - 16 -> 17 [arrowhead=none, - penwidth=2.0]; + graph [rankdir=LR, + splines=polyline + ]; + node [label="\N"]; + 12 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=12, + pin=true, + pos="1,12!", + shape=circle, + style=filled, + width=1]; + 13 [fillcolor="#DFDFFF", + fixedsize=true, + group=default_alt, + height=1, + label=13, + pin=true, + pos="2,13!", + shape=pentagon, + style="dotted, filled", + width=1]; + 12 -> 13 [arrowhead=none, + penwidth=2.0]; + 18 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=18, + pin=true, + pos="1,18!", + shape=pentagon, + style=filled, + width=1]; + 12 -> 18 [arrowhead=none, + penwidth=2.0]; + 16 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=16, + pin=true, + pos="1,16!", + shape=circle, + style=filled, + width=1]; + 12 -> 16 [arrowhead=none, + penwidth=2.0]; + 13 -> 18 [arrowtail=none, + dir=back, + minlen=0, + penwidth=2.0, + style=dashed]; + 14 [fillcolor="#FF4F4F", + fixedsize=true, + group=default_alt, + height=1, + label=14, + pin=true, + pos="2,14!", + shape=pentagon, + style=filled, + width=1]; + 13 -> 14 [arrowhead=none, + penwidth=2.0]; + 15 [fillcolor="#FF4F4F", + fixedsize=true, + group=default_alt, + height=1, + label=15, + pin=true, + pos="2,15!", + shape=pentagon, + style=filled, + width=1]; + 14 -> 15 [arrowhead=none, + penwidth=2.0]; + 17 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=17, + pin=true, + pos="1,17!", + shape=circle, + style=filled, + width=1]; + 16 -> 17 [arrowhead=none, + penwidth=2.0]; } #endif @@ -1433,80 +1433,80 @@ .. graphviz:: strict digraph "Mercurial graph" { - graph [rankdir=LR, - splines=polyline - ]; - node [label="\N"]; - 12 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=12, - pin=true, - pos="1,12!", - shape=circle, - style=filled, - width=1]; - 16 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=16, - pin=true, - pos="1,16!", - shape=circle, - style=filled, - width=1]; - 12 -> 16 [arrowhead=none, - penwidth=2.0]; - 18 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=18, - pin=true, - pos="1,18!", - shape=pentagon, - style=filled, - width=1]; - 12 -> 18 [arrowhead=none, - penwidth=2.0]; - 17 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=17, - pin=true, - pos="1,17!", - shape=circle, - style=filled, - width=1]; - 16 -> 17 [arrowhead=none, - penwidth=2.0]; - 19 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=19, - pin=true, - pos="1,19!", - shape=pentagon, - style=filled, - width=1]; - 18 -> 19 [arrowhead=none, - penwidth=2.0]; - 20 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=20, - pin=true, - pos="1,20!", - shape=pentagon, - style=filled, - width=1]; - 19 -> 20 [arrowhead=none, - penwidth=2.0]; + graph [rankdir=LR, + splines=polyline + ]; + node [label="\N"]; + 12 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=12, + pin=true, + pos="1,12!", + shape=circle, + style=filled, + width=1]; + 16 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=16, + pin=true, + pos="1,16!", + shape=circle, + style=filled, + width=1]; + 12 -> 16 [arrowhead=none, + penwidth=2.0]; + 18 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=18, + pin=true, + pos="1,18!", + shape=pentagon, + style=filled, + width=1]; + 12 -> 18 [arrowhead=none, + penwidth=2.0]; + 17 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=17, + pin=true, + pos="1,17!", + shape=circle, + style=filled, + width=1]; + 16 -> 17 [arrowhead=none, + penwidth=2.0]; + 19 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=19, + pin=true, + pos="1,19!", + shape=pentagon, + style=filled, + width=1]; + 18 -> 19 [arrowhead=none, + penwidth=2.0]; + 20 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=20, + pin=true, + pos="1,20!", + shape=pentagon, + style=filled, + width=1]; + 19 -> 20 [arrowhead=none, + penwidth=2.0]; } #endif Multi-headed stack @@ -1615,152 +1615,152 @@ .. graphviz:: strict digraph "Mercurial graph" { - graph [rankdir=LR, - splines=polyline - ]; - node [label="\N"]; - 0 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=0, - pin=true, - pos="1,0!", - shape=circle, - style=filled, - width=1]; - 3 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=3, - pin=true, - pos="1,3!", - shape=circle, - style=filled, - width=1]; - 0 -> 3 [arrowhead=none, - penwidth=2.0]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 3 -> 4 [arrowhead=none, - penwidth=2.0]; - 5 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=5, - pin=true, - pos="1,5!", - shape=circle, - style=filled, - width=1]; - 4 -> 5 [arrowhead=none, - penwidth=2.0]; - 11 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=11, - pin=true, - pos="1,11!", - shape=circle, - style=filled, - width=1]; - 5 -> 11 [arrowhead=none, - penwidth=2.0]; - 12 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=12, - pin=true, - pos="1,12!", - shape=circle, - style=filled, - width=1]; - 11 -> 12 [arrowhead=none, - penwidth=2.0]; - 16 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=16, - pin=true, - pos="1,16!", - shape=circle, - style=filled, - width=1]; - 12 -> 16 [arrowhead=none, - penwidth=2.0]; - 18 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=18, - pin=true, - pos="1,18!", - shape=pentagon, - style=filled, - width=1]; - 12 -> 18 [arrowhead=none, - penwidth=2.0]; - 17 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=17, - pin=true, - pos="1,17!", - shape=circle, - style=filled, - width=1]; - 16 -> 17 [arrowhead=none, - penwidth=2.0]; - 19 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=19, - pin=true, - pos="1,19!", - shape=pentagon, - style=filled, - width=1]; - 18 -> 19 [arrowhead=none, - penwidth=2.0]; - 21 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=21, - pin=true, - pos="1,21!", - shape=pentagon, - style=filled, - width=1]; - 18 -> 21 [arrowhead=none, - penwidth=2.0]; - 20 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=20, - pin=true, - pos="1,20!", - shape=pentagon, - style=filled, - width=1]; - 19 -> 20 [arrowhead=none, - penwidth=2.0]; + graph [rankdir=LR, + splines=polyline + ]; + node [label="\N"]; + 0 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=0, + pin=true, + pos="1,0!", + shape=circle, + style=filled, + width=1]; + 3 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=3, + pin=true, + pos="1,3!", + shape=circle, + style=filled, + width=1]; + 0 -> 3 [arrowhead=none, + penwidth=2.0]; + 4 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=4, + pin=true, + pos="1,4!", + shape=circle, + style=filled, + width=1]; + 3 -> 4 [arrowhead=none, + penwidth=2.0]; + 5 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=5, + pin=true, + pos="1,5!", + shape=circle, + style=filled, + width=1]; + 4 -> 5 [arrowhead=none, + penwidth=2.0]; + 11 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=11, + pin=true, + pos="1,11!", + shape=circle, + style=filled, + width=1]; + 5 -> 11 [arrowhead=none, + penwidth=2.0]; + 12 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=12, + pin=true, + pos="1,12!", + shape=circle, + style=filled, + width=1]; + 11 -> 12 [arrowhead=none, + penwidth=2.0]; + 16 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=16, + pin=true, + pos="1,16!", + shape=circle, + style=filled, + width=1]; + 12 -> 16 [arrowhead=none, + penwidth=2.0]; + 18 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=18, + pin=true, + pos="1,18!", + shape=pentagon, + style=filled, + width=1]; + 12 -> 18 [arrowhead=none, + penwidth=2.0]; + 17 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=17, + pin=true, + pos="1,17!", + shape=circle, + style=filled, + width=1]; + 16 -> 17 [arrowhead=none, + penwidth=2.0]; + 19 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=19, + pin=true, + pos="1,19!", + shape=pentagon, + style=filled, + width=1]; + 18 -> 19 [arrowhead=none, + penwidth=2.0]; + 21 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=21, + pin=true, + pos="1,21!", + shape=pentagon, + style=filled, + width=1]; + 18 -> 21 [arrowhead=none, + penwidth=2.0]; + 20 [fillcolor="#7F7FFF", + fixedsize=true, + group=default, + height=1, + label=20, + pin=true, + pos="1,20!", + shape=pentagon, + style=filled, + width=1]; + 19 -> 20 [arrowhead=none, + penwidth=2.0]; } #endif