diff -r d5adce52cef4 -r 98941c28f3e2 tests/test-tutorial.t --- a/tests/test-tutorial.t Wed Mar 21 16:06:17 2018 +0100 +++ b/tests/test-tutorial.t Wed Mar 21 16:18:31 2018 +0100 @@ -311,17 +311,15 @@ width=1]; 0 -> 1 [arrowhead=none, penwidth=2.0]; - 3 [fillcolor="#7F7FFF", + 4 [fillcolor="#9999FF", fixedsize=true, group=default, height=1, label=3, pin=true, - pos="1,3!", + pos="1,4!", shape=pentagon, style=filled, - width=1]; - 1 -> 3 [arrowhead=none, penwidth=2.0]; } #endif @@ -366,7 +364,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - new changesets 9ca060c80d74 (run 'hg heads' to see heads, 'hg merge' to merge) I now have a new head. Note that this remote head is immutable. @@ -412,29 +409,12 @@ width=1]; 0 -> 1 [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]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; - 3 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=3, - pin=true, - pos="1,3!", - shape=pentagon, - style=filled, - width=1]; - 1 -> 3 [arrowhead=none, penwidth=2.0]; } #endif @@ -445,7 +425,7 @@ $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 rebasing 1:4d5dc8187023 "adding condiment" merging shopping - rebasing 3:9d0363b81950 "adding fruit" + rebasing 4:9d0363b81950 "adding fruit" merging shopping @@ -478,30 +458,14 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; - 5 [fillcolor="#7F7FFF", fixedsize=true, group=default, height=1, label=5, pin=true, pos="1,5!", - shape=pentagon, + shape=circle, style=filled, - width=1]; - 4 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#7F7FFF", fixedsize=true, @@ -515,6 +479,18 @@ width=1]; 5 -> 6 [arrowhead=none, penwidth=2.0]; + 7 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=7, + pin=true, + pos="1,7!", + shape=pentagon, + style=filled, + width=0.5]; + 6 -> 7 [arrowhead=none, + penwidth=2.0]; } #endif @@ -580,30 +556,14 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; - 5 [fillcolor="#7F7FFF", fixedsize=true, group=default, height=1, label=5, pin=true, pos="1,5!", - shape=pentagon, + shape=circle, style=filled, - width=1]; - 4 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#7F7FFF", fixedsize=true, @@ -617,6 +577,18 @@ width=1]; 5 -> 6 [arrowhead=none, penwidth=2.0]; + 7 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=7, + pin=true, + pos="1,7!", + shape=pentagon, + style=filled, + width=0.5]; + 6 -> 7 [arrowhead=none, + penwidth=2.0]; } #endif @@ -665,7 +637,7 @@ $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent - grabbing 9:fac207dec9f5 "SPAM SPAM" + grabbing 10:fac207dec9f5 "SPAM SPAM" merging shopping $ hg log -G @ 57e9caedbcb8 (draft): SPAM SPAM @@ -699,30 +671,14 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; - 5 [fillcolor="#7F7FFF", fixedsize=true, group=default, height=1, label=5, pin=true, pos="1,5!", - shape=pentagon, + shape=circle, style=filled, - width=1]; - 4 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#7F7FFF", fixedsize=true, @@ -736,29 +692,7 @@ width=1]; 5 -> 6 [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]; - 6 -> 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]; - 6 -> 10 [arrowhead=none, + height=0.5, penwidth=2.0]; } #endif @@ -802,12 +736,12 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files - 5 new obsolescence markers + 6 new obsolescence markers for simplicity sake we get the bathroom change in line again $ hg grab 10b8aeaa8cc8 - grabbing 8:10b8aeaa8cc8 "bathroom stuff" + grabbing 9:10b8aeaa8cc8 "bathroom stuff" merging shopping $ hg phase --draft . $ hg log -G @@ -842,54 +776,6 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 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=circle, - style=filled, - width=1]; - 5 -> 6 [arrowhead=none, - penwidth=2.0]; - 10 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=10, - pin=true, - pos="1,10!", - shape=circle, - style=filled, - width=1]; - 6 -> 10 [arrowhead=none, penwidth=2.0]; 11 [fillcolor="#7F7FFF", fixedsize=true, @@ -898,10 +784,20 @@ label=11, pin=true, pos="1,11!", + shape=circle, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, + penwidth=2.0]; + 12 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=12, + pin=true, + pos="1,12!", shape=pentagon, style=filled, - width=1]; - 10 -> 11 [arrowhead=none, penwidth=2.0]; } #endif @@ -1014,7 +910,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets 4710c0968793 (run 'hg update' to get a working copy) $ hg log -G o 4710c0968793 (public): bathroom stuff @@ -1070,7 +965,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets 4710c0968793 (run 'hg update' to get a working copy) $ hg log -G o 4710c0968793 (draft): bathroom stuff @@ -1138,66 +1032,22 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, pin=true, - pos="1,4!", + pos="1,11!", shape=circle, style=filled, - width=1]; - 0 -> 4 [arrowhead=none, + width=0.5]; + 7 -> 11 [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", + 14 [fillcolor="#9999FF", fixedsize=true, group=default, - height=1, - label=6, + height=0.5, + label=14, pin=true, - pos="1,6!", - shape=circle, - style=filled, - width=1]; - 5 -> 6 [arrowhead=none, - penwidth=2.0]; - 10 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=10, - pin=true, - pos="1,10!", - shape=circle, - style=filled, - width=1]; - 6 -> 10 [arrowhead=none, - penwidth=2.0]; - 12 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=12, - pin=true, - pos="1,12!", + pos="1,14!", shape=pentagon, style=filled, - width=1]; - 10 -> 12 [arrowhead=none, penwidth=2.0]; } #endif @@ -1210,10 +1060,9 @@ adding changesets adding manifests adding file changes - added 1 changesets with 1 changes to 1 files - new changesets e4e4fa805d92 - (run 'hg update' to get a working copy) - 1 new orphan changesets + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads' to see heads, 'hg merge' to merge) + 1 new unstable changesets The new changeset "animal" is based on an old changeset of "bathroom". You can see both version showing up in the log. @@ -1254,95 +1103,6 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 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=circle, - style=filled, - width=1]; - 5 -> 6 [arrowhead=none, - penwidth=2.0]; - 10 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=10, - pin=true, - pos="1,10!", - shape=circle, - style=filled, - width=1]; - 6 -> 10 [arrowhead=none, - penwidth=2.0]; - 11 [fillcolor="#DFDFFF", - fixedsize=true, - group=default_alt, - height=1, - label=11, - pin=true, - pos="2,11!", - shape=pentagon, - style="dotted, filled", - width=1]; - 10 -> 11 [arrowhead=none, - penwidth=2.0]; - 12 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=12, - pin=true, - pos="1,12!", - shape=pentagon, - style=filled, - width=1]; - 10 -> 12 [arrowhead=none, - penwidth=2.0]; - 11 -> 12 [arrowtail=none, - dir=back, - minlen=0, - penwidth=2.0, - style=dashed]; - 13 [fillcolor="#FF4F4F", - fixedsize=true, - group=default_alt, - height=1, - label=13, - pin=true, - pos="2,13!", - shape=pentagon, - style=filled, - width=1]; - 11 -> 13 [arrowhead=none, penwidth=2.0]; } #endif @@ -1358,7 +1118,7 @@ $ hg push other pushing to $TESTTMP/other (glob) searching for changes - abort: push includes orphan changeset: e4e4fa805d92! + abort: push includes unstable changeset: e4e4fa805d92! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] @@ -1369,15 +1129,15 @@ It has a --dry-run option to only suggest the next move. $ hg evolve --dry-run - move:[13] animals - atop:[12] bathroom stuff + move:[15] animals + atop:[14] bathroom stuff hg rebase -r e4e4fa805d92 -d 682004e81e71 Let's do it $ hg evolve - move:[13] animals - atop:[12] bathroom stuff + move:[15] animals + atop:[14] bathroom stuff merging shopping working directory is now at 2a2b36e14660 @@ -1417,30 +1177,6 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 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, @@ -1454,41 +1190,6 @@ width=1]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=10, - pin=true, - pos="1,10!", - shape=circle, - style=filled, - width=1]; - 6 -> 10 [arrowhead=none, - penwidth=2.0]; - 12 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=12, - pin=true, - pos="1,12!", - shape=pentagon, - style=filled, - width=1]; - 10 -> 12 [arrowhead=none, - penwidth=2.0]; - 14 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=14, - pin=true, - pos="1,14!", - shape=pentagon, - style=filled, - width=1]; - 12 -> 14 [arrowhead=none, penwidth=2.0]; } #endif @@ -1502,7 +1203,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) - 2 new obsolescence markers + 3 new obsolescence markers obsoleted 2 changesets Remote get a warning that current working directory is based on an obsolete @@ -1543,7 +1244,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets fc41faf45288 (run 'hg update' to get a working copy) $ hg log -G o fc41faf45288 (draft): SPAM SPAM SPAM @@ -1581,20 +1281,6 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; - 5 [fillcolor="#7F7FFF", fixedsize=true, group=default, height=1, @@ -1603,8 +1289,6 @@ pos="1,5!", shape=circle, style=filled, - width=1]; - 4 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#7F7FFF", fixedsize=true, @@ -1618,29 +1302,19 @@ width=1]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#7F7FFF", fixedsize=true, group=default, - height=1, - label=10, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, - width=1]; - 6 -> 10 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#7F7FFF", fixedsize=true, group=default, - height=1, - label=12, pin=true, - pos="1,12!", - shape=pentagon, + pos="1,11!", + shape=circle, style=filled, - width=1]; - 10 -> 12 [arrowhead=none, penwidth=2.0]; 14 [fillcolor="#7F7FFF", fixedsize=true, @@ -1651,20 +1325,13 @@ pos="1,14!", shape=pentagon, style=filled, - width=1]; - 12 -> 14 [arrowhead=none, penwidth=2.0]; - 15 [fillcolor="#7F7FFF", fixedsize=true, group=default, - height=1, - label=15, pin=true, - pos="1,15!", + pos="1,16!", shape=pentagon, style=filled, - width=1]; - 14 -> 15 [arrowhead=none, penwidth=2.0]; } #endif @@ -1675,7 +1342,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at 682004e81e71 1 changesets pruned - 1 new orphan changesets + 1 new unstable changesets The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset @@ -1717,20 +1384,6 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; - 5 [fillcolor="#7F7FFF", fixedsize=true, group=default, height=1, @@ -1739,8 +1392,6 @@ pos="1,5!", shape=circle, style=filled, - width=1]; - 4 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#7F7FFF", fixedsize=true, @@ -1754,53 +1405,47 @@ width=1]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#7F7FFF", fixedsize=true, group=default, - height=1, - label=10, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, - width=1]; - 6 -> 10 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#7F7FFF", fixedsize=true, group=default, - height=1, - label=12, pin=true, - pos="1,12!", + pos="1,11!", + shape=circle, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, + penwidth=2.0]; + 14 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=14, + pin=true, + pos="1,14!", shape=pentagon, style=filled, - width=1]; - 10 -> 12 [arrowhead=none, penwidth=2.0]; - 14 [fillcolor="#DFDFFF", + 16 [fillcolor="#DFDFFF", fixedsize=true, group=default_alt, - height=1, - label=14, pin=true, - pos="2,14!", + pos="2,16!", shape=pentagon, style="dotted, filled", - width=1]; - 12 -> 14 [arrowhead=none, penwidth=2.0]; - 15 [fillcolor="#FF4F4F", + 17 [fillcolor="#FF4F4F", fixedsize=true, group=default_alt, - height=1, - label=15, pin=true, - pos="2,15!", + pos="2,17!", shape=pentagon, style=filled, - width=1]; - 14 -> 15 [arrowhead=none, penwidth=2.0]; } #endif @@ -1817,13 +1462,11 @@ splines=polyline ]; node [label="\N"]; - 15 [fillcolor="#FF4F4F", + 17 [fillcolor="#FF4F4F", fixedsize=true, group=default_alt, - height=1, - label=15, pin=true, - pos="1,15!", + pos="1,17!", shape=pentagon, style=filled, width=1]; @@ -1831,8 +1474,8 @@ #endif $ hg evolve - move:[15] SPAM SPAM SPAM - atop:[12] bathroom stuff + move:[17] SPAM SPAM SPAM + atop:[14] bathroom stuff merging shopping working directory is now at e6cfcb672150 @@ -1870,20 +1513,6 @@ pos="1,0!", shape=circle, style=filled, - width=1]; - 4 [fillcolor="#7F7FFF", - fixedsize=true, - group=default, - height=1, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=1]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; - 5 [fillcolor="#7F7FFF", fixedsize=true, group=default, height=1, @@ -1892,8 +1521,6 @@ pos="1,5!", shape=circle, style=filled, - width=1]; - 4 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#7F7FFF", fixedsize=true, @@ -1907,41 +1534,38 @@ width=1]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#7F7FFF", fixedsize=true, group=default, - height=1, - label=10, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, - width=1]; - 6 -> 10 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#7F7FFF", fixedsize=true, group=default, - height=1, - label=12, pin=true, - pos="1,12!", + pos="1,11!", + shape=circle, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, + penwidth=2.0]; + 14 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=14, + pin=true, + pos="1,14!", shape=pentagon, style=filled, - width=1]; - 10 -> 12 [arrowhead=none, penwidth=2.0]; - 16 [fillcolor="#7F7FFF", fixedsize=true, group=default, - height=1, - label=16, pin=true, - pos="1,16!", + pos="1,18!", shape=pentagon, style=filled, - width=1]; - 12 -> 16 [arrowhead=none, penwidth=2.0]; } #endif