--- a/tests/test-tutorial.t Tue Jul 25 15:17:17 2017 +0200
+++ b/tests/test-tutorial.t Wed Sep 27 01:07:22 2017 +0200
@@ -3,6 +3,7 @@
-------------
This Mercurial configuration example is used for testing.
+
.. Various setup
$ cat >> $HGRCPATH << EOF
@@ -64,6 +65,10 @@
> rebase =
> EOF
+#if docgraph-ext
+ $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore
+#endif
+
-----------------------
Single Developer Usage
-----------------------
@@ -124,6 +129,51 @@
|
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 1 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=1,
+ pin=true,
+ pos="1,1!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 0 -> 1 [arrowhead=none,
+ penwidth=2.0];
+ 2 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=2,
+ pin=true,
+ pos="1,2!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 1 -> 2 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
But a typo was made in Babanas!
@@ -158,7 +208,53 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 1 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=1,
+ pin=true,
+ pos="1,1!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 0 -> 1 [arrowhead=none,
+ penwidth=2.0];
+ 2 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=2,
+ pin=true,
+ pos="1,2!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 1 -> 2 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
+
+Hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
$ sed -i'' -e s/Bananos/Banana/ shopping
$ hg diff
@@ -184,6 +280,52 @@
|
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 1 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=1,
+ pin=true,
+ pos="1,1!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 0 -> 1 [arrowhead=none,
+ penwidth=2.0];
+ 4 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=4,
+ pin=true,
+ pos="1,4!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 1 -> 4 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
+
$ hg export tip
# HG changeset patch
# User test
@@ -207,7 +349,7 @@
Getting rid of branchy history
----------------------------------
-While I was working on my list. someone made a change remotely.
+While I was working on my list. Someone made a change remotely.
$ cd ../remote
$ hg up -q
@@ -226,7 +368,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
-I now have a new heads. Note that this remote head is immutable
+I now have a new head. Note that this remote head is immutable.
$ hg log -G
o 9ca060c80d74 (public): SPAM
@@ -238,7 +380,65 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-instead of merging my head with the new one. I'm going to rebase my work
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 1 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=1,
+ pin=true,
+ pos="1,1!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 0 -> 1 [arrowhead=none,
+ penwidth=2.0];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 4 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=4,
+ pin=true,
+ pos="1,4!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 1 -> 4 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
+
+Instead of merging my head with the new one. I'm going to rebase my work
$ hg diff
$ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
@@ -259,11 +459,68 @@
|
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 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
Removing changesets
------------------------
-I add new item to my list
+I add new items to my list.
$ cat >> shopping << EOF
> car
@@ -284,7 +541,7 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-I have a new commit but I realize that don't want it. (transport shop list does
+I have a new commit but I realize that don't want it. (Transport shop list does
not fit well in my standard shopping list)
$ hg prune . # "." is for working directory parent
@@ -304,6 +561,64 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 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
+
Reordering changesets
------------------------
@@ -366,6 +681,88 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 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];
+ 9 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=9,
+ pin=true,
+ pos="1,9!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 7 -> 9 [arrowhead=none,
+ penwidth=2.0];
+ 11 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=11,
+ pin=true,
+ pos="1,11!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 7 -> 11 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
+
We have a new SPAM SPAM version without the bathroom stuff
$ grep Spam shopping # enough spam
@@ -428,7 +825,87 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 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=circle,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
+ 11 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ 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=0.5];
+ 11 -> 12 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
Splitting change
------------------
@@ -513,7 +990,7 @@
-----------------------
-sharing mutable changesets
+Sharing mutable changesets
----------------------------
To share mutable changesets with others, just check that the repo you interact
@@ -524,7 +1001,7 @@
$ hg -R ../local/ showconfig phases
[1]
-the localrepo does not have any specific configuration for `phases.publish`. It
+The localrepo does not have any specific configuration for `phases.publish`. It
is ``true`` by default.
$ hg pull local
@@ -550,8 +1027,6 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
We do not want to publish the "bathroom changeset". Let's rollback the last transaction.
.. Warning: Rollback is actually a dangerous kind of internal command that is deprecated and should not be exposed to user. Please forget you read about it until someone fix this tutorial.
@@ -570,7 +1045,7 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-Let's make the local repo "non publishing"
+Let's make the local repo "non publishing".
$ echo '[phases]' >> ../local/.hg/hgrc
$ echo 'publish=false' >> ../local/.hg/hgrc
@@ -641,6 +1116,87 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 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=circle,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
+ 11 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=11,
+ pin=true,
+ 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=0.5];
+ 11 -> 14 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
When we pull from remote again we get an unstable state!
@@ -676,6 +1232,116 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 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=circle,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
+ 11 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=11,
+ pin=true,
+ pos="1,11!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 7 -> 11 [arrowhead=none,
+ penwidth=2.0];
+ 12 [fillcolor="#DFDFFF",
+ fixedsize=true,
+ group=default_alt,
+ height=0.5,
+ label=12,
+ pin=true,
+ pos="2,12!",
+ shape=pentagon,
+ style="dotted, filled",
+ width=0.5];
+ 11 -> 12 [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=0.5];
+ 11 -> 14 [arrowhead=none,
+ penwidth=2.0];
+ 12 -> 14 [arrowhead=none,
+ minlen=0,
+ penwidth=2.0,
+ style=dashed];
+ 15 [fillcolor="#FF4F4F",
+ fixedsize=true,
+ group=default_alt,
+ height=0.5,
+ label=15,
+ pin=true,
+ pos="2,15!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 12 -> 15 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
+
The older version 75954b8cd933 never ceased to exist in the local repo. It was
just hidden and excluded from pull and push.
@@ -692,8 +1358,6 @@
[255]
-
-
To resolve this unstable state, you need to rebase bf1b0d202029 onto
a44c85f957d3. The `hg evolve` command will do this for you.
@@ -730,8 +1394,101 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 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=circle,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
+ 11 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=11,
+ pin=true,
+ 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=0.5];
+ 11 -> 14 [arrowhead=none,
+ penwidth=2.0];
+ 16 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=16,
+ pin=true,
+ pos="1,16!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 14 -> 16 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
-We can push this evolution to remote
+We can push this evolution to remote.
$ hg push remote
pushing to $TESTTMP/remote (glob)
@@ -742,7 +1499,8 @@
added 2 changesets with 2 changes to 1 files (+1 heads)
3 new obsolescence markers
-remote get a warning that current working directory is based on an obsolete changeset
+Remote get a warning that current working directory is based on an obsolete
+changeset.
$ cd ../remote
$ hg pull local # we up again to trigger the warning. it was displayed during the push
@@ -752,7 +1510,7 @@
working directory parent is obsolete! (bf1b0d202029)
(use 'hg evolve' to update to its successor: ee942144f952)
-now let's see where we are, and update to the successor
+Now let's see where we are, and update to the successor.
$ hg parents
bf1b0d202029 (draft): animals
@@ -766,7 +1524,7 @@
Relocating unstable change after prune
----------------------------------------------
-The remote guy keep working
+The remote guy keeps working.
$ sed -i'' -e 's/Spam/Spam Spam Spam Spam/g' shopping
$ hg commit -m "SPAM SPAM SPAM"
@@ -800,6 +1558,112 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 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=circle,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
+ 11 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=11,
+ pin=true,
+ 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=0.5];
+ 11 -> 14 [arrowhead=none,
+ penwidth=2.0];
+ 16 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=16,
+ pin=true,
+ pos="1,16!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 14 -> 16 [arrowhead=none,
+ penwidth=2.0];
+ 17 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=17,
+ pin=true,
+ pos="1,17!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 16 -> 17 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
+
In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
$ hg prune ee942144f952
@@ -810,7 +1674,7 @@
The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
-is neither dead or obsolete. My repository is in an unstable state again.
+is neither dead or obsolete. My repository is in an unstable state again.
$ hg log -G
o 99f039c5ec9e (draft): SPAM SPAM SPAM
@@ -830,9 +1694,137 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
- $ hg log -r 'unstable()'
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 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=circle,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
+ 11 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=11,
+ pin=true,
+ 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=0.5];
+ 11 -> 14 [arrowhead=none,
+ penwidth=2.0];
+ 16 [fillcolor="#DFDFFF",
+ fixedsize=true,
+ group=default_alt,
+ height=0.5,
+ label=16,
+ pin=true,
+ pos="2,16!",
+ shape=pentagon,
+ style="dotted, filled",
+ width=0.5];
+ 14 -> 16 [arrowhead=none,
+ penwidth=2.0];
+ 17 [fillcolor="#FF4F4F",
+ fixedsize=true,
+ group=default_alt,
+ height=0.5,
+ label=17,
+ pin=true,
+ pos="2,17!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 16 -> 17 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
+
+ $ hg log -r "unstable()"
99f039c5ec9e (draft): SPAM SPAM SPAM
+#if docgraph-ext
+ $ hg docgraph -r "unstable()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 17 [fillcolor="#FF4F4F",
+ fixedsize=true,
+ group=default_alt,
+ height=0.5,
+ label=17,
+ pin=true,
+ pos="1,17!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ }
+#endif
+
$ hg evolve
move:[17] SPAM SPAM SPAM
atop:[14] bathroom stuff
@@ -855,6 +1847,99 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
+#if docgraph-ext
+ $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
+ .. graphviz::
+
+ strict digraph {
+ graph [rankdir=LR,
+ splines=polyline
+ ];
+ node [label="\N"];
+ 0 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=0,
+ pin=true,
+ pos="1,0!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 5 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=5,
+ pin=true,
+ pos="1,5!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 0 -> 5 [arrowhead=none,
+ penwidth=2.0];
+ 6 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=6,
+ pin=true,
+ pos="1,6!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 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=circle,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
+ 11 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=11,
+ pin=true,
+ 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=0.5];
+ 11 -> 14 [arrowhead=none,
+ penwidth=2.0];
+ 18 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=18,
+ pin=true,
+ pos="1,18!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 14 -> 18 [arrowhead=none,
+ penwidth=2.0];
+ }
+#endif
Handling Divergent amend
----------------------------------------------