Mercurial > evolve
changeset 3377:4f75e0a5d82d
Small typos fixing in the topic tutorial
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Mon, 08 Jan 2018 17:38:58 +0100 |
| parents | aad37ffd7d58 |
| children | 577bfc34e19b |
| files | tests/test-topic-tutorial.t |
| diffstat | 1 files changed, 454 insertions(+), 452 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Mon Jan 08 11:46:53 2018 +0100 +++ b/tests/test-topic-tutorial.t Mon Jan 08 17:38:58 2018 +0100 @@ -53,8 +53,10 @@ finalized (moved to the public phase). They can help users to organize and share their unfinished work. -In this tutorial, we explain how to use topics for local development. In the first part, -there is a central *publishing* server. Anything pushed to the central server will become public and immutable This means no unfinished work should escapes the local repository. +In this tutorial, we explain how to use topics for local development. In the +first part, there is a central *publishing* server. Anything pushed to the +central server will become public and immutable. This means no unfinished work +should escape the local repository. Topic Basics @@ -696,8 +698,8 @@ Keep working within topics ========================== -Making sure all your new local commit are made within a topic will help your -organise your work. It is possible to ensure this through the Mercurial +Making sure all your new local commit are made within a topic will help you +organize your work. It is possible to ensure this through the Mercurial configuration. For this tutorial, we'll add the config at the repository level: @@ -727,7 +729,7 @@ Working with Multiple Topics ============================ -In the above example, topics do not bring much benefits since you only have one +In the above example, topics do not bring many benefits since you only have one line of development. Topics start to be more useful when you have to work on multiple features at the same time. @@ -898,140 +900,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 @@ -1241,97 +1243,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 @@ -1422,80 +1424,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 @@ -1604,152 +1606,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 @@ -1811,7 +1813,7 @@ added 4 changesets with 4 changes to 1 files (+1 heads) 8 new obsolescence markers -Pushing the new topic branch to a non publishing server did not require +Pushing the new topic branch to a non-publishing server did not require --force. As long as new heads are on their own topic, Mercurial will not complain about them. @@ -1860,7 +1862,7 @@ adding file changes added 1 changesets with 1 changes to 1 files -And retrieve them on the first client: +And retrieve them from the first client: $ cd ../client