--- a/tests/test-tutorial.t Sat Jan 20 12:28:32 2018 +0100
+++ b/tests/test-tutorial.t Sat Jan 20 12:38:09 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
- rebasing 9:fac207dec9f5 "SPAM SPAM" (tip)
+ rebasing 10:fac207dec9f5 "SPAM SPAM" (tip)
merging shopping
? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
$ hg log -G
@@ -700,30 +672,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,
@@ -737,29 +693,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
@@ -803,12 +737,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
- rebasing 8:10b8aeaa8cc8 "bathroom stuff"
+ rebasing 9:10b8aeaa8cc8 "bathroom stuff"
merging shopping
? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
$ hg phase --draft .
@@ -844,54 +778,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,
@@ -900,10 +786,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
@@ -1016,7 +912,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets 75954b8cd933
(run 'hg update' to get a working copy)
$ hg log -G
o 75954b8cd933 (public): bathroom stuff
@@ -1072,7 +967,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets 75954b8cd933
(run 'hg update' to get a working copy)
$ hg log -G
o 75954b8cd933 (draft): bathroom stuff
@@ -1140,66 +1034,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
@@ -1212,10 +1062,9 @@
adding changesets
adding manifests
adding file changes
- added 1 changesets with 1 changes to 1 files
- new changesets bf1b0d202029
- (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
@@ -1257,95 +1106,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
@@ -1361,7 +1121,7 @@
$ hg push other
pushing to $TESTTMP/other (glob)
searching for changes
- abort: push includes orphan changeset: bf1b0d202029!
+ abort: push includes unstable changeset: bf1b0d202029!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
@@ -1372,15 +1132,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 bf1b0d202029 -d a44c85f957d3
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 ee942144f952
@@ -1420,30 +1180,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,
@@ -1457,41 +1193,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
@@ -1505,7 +1206,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
@@ -1546,7 +1247,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 99f039c5ec9e
(run 'hg update' to get a working copy)
$ hg log -G
o 99f039c5ec9e (draft): SPAM SPAM SPAM
@@ -1584,20 +1284,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,
@@ -1606,8 +1292,6 @@
pos="1,5!",
shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -1621,29 +1305,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,
@@ -1654,20 +1328,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
@@ -1678,7 +1345,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory now at a44c85f957d3
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
@@ -1720,20 +1387,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,
@@ -1742,8 +1395,6 @@
pos="1,5!",
shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -1757,53 +1408,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
@@ -1820,13 +1465,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];
@@ -1834,8 +1477,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 40aa40daeefb
@@ -1873,20 +1516,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,
@@ -1895,8 +1524,6 @@
pos="1,5!",
shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -1910,41 +1537,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