author | Martin von Zweigbergk <martinvonz@google.com> |
Mon, 22 Apr 2019 22:14:26 -0700 | |
branch | stable |
changeset 4565 | 393a58d71b30 |
parent 4432 | 5da1d162ad50 |
child 4512 | 7a779a288793 |
child 4613 | 30a544904238 |
permissions | -rw-r--r-- |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 |
============== |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 |
Topic Tutorial |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
3 |
============== |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 |
|
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
5 |
This Mercurial configuration example is used for testing. |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 |
|
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
7 |
.. Various setup |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 |
|
2045
db617700d318
tests: move "test setup" script into a 'testlib' directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2014
diff
changeset
|
9 |
$ . "$TESTDIR/testlib/topic_setup.sh" |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
10 |
$ cat >> $HGRCPATH << EOF |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
11 |
> [experimental] |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
12 |
> evolution=all |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
13 |
> [extensions] |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
14 |
> evolve= |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
15 |
> EOF |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
16 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 |
$ hg init server |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
18 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 |
$ cd server |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
20 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 |
$ cat >> .hg/hgrc << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 |
> [ui] |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 |
> user= Shopping Master |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
> EOF |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
25 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
26 |
$ cat >> shopping << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
27 |
> Spam |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
28 |
> Whizzo butter |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 |
> Albatross |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
30 |
> Rat (rather a lot) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 |
> Jugged fish |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 |
> Blancmange |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 |
> Salmon mousse |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 |
> EOF |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
35 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
36 |
$ hg commit -A -m "Shopping list" |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
37 |
adding shopping |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
38 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
39 |
$ cd .. |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
40 |
$ hg clone server client |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
41 |
updating to branch default |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
42 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 |
$ cd client |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 |
$ cat >> .hg/hgrc << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
45 |
> [ui] |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
46 |
> user= Tutorial User |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
47 |
> EOF |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
48 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
49 |
$ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
50 |
#endif |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
51 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
52 |
Topic branches are lightweight branches which disappear when changes are |
2885 | 53 |
finalized (moved to the public phase). They can help users to organize and share |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
54 |
their unfinished work. |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
55 |
|
3377
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
56 |
In this tutorial, we explain how to use topics for local development. In the |
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
57 |
first part, there is a central *publishing* server. Anything pushed to the |
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
58 |
central server will become public and immutable. This means no unfinished work |
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
59 |
should escape the local repository. |
2971
222ad649380b
topics/tuto: clarification on the scope of the tutorial
Aurélien Campéas
parents:
2970
diff
changeset
|
60 |
|
222ad649380b
topics/tuto: clarification on the scope of the tutorial
Aurélien Campéas
parents:
2970
diff
changeset
|
61 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
62 |
Topic Basics |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
63 |
============ |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
64 |
|
2825 | 65 |
Let's say we use Mercurial to manage our shopping list: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
66 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
67 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
68 |
@ changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
69 |
tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
70 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
71 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
72 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
73 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
74 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
75 |
$ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
76 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
77 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
78 |
strict digraph "Mercurial graph" { |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
79 |
graph [rankdir=LR, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
80 |
splines=polyline |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
81 |
]; |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
82 |
node [label="\N"]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
83 |
0 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
84 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
85 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
86 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
87 |
label=0, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
88 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
89 |
pos="1,0!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
90 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
91 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
92 |
width=1]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
93 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
94 |
#endif |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
95 |
|
2885 | 96 |
We are about to make some additions to this list and would like to do them |
2825 | 97 |
within a topic. Creating a new topic is done using the ``topic`` command: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
98 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
99 |
$ hg topics food |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2984
diff
changeset
|
100 |
marked working directory as topic: food |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
101 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
102 |
Much like a named branch, our topic is active but it does not contain any |
2885 | 103 |
changeset yet: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
104 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
105 |
$ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
106 |
* food (0 changesets) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
107 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
108 |
$ hg summary |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
109 |
parent: 0:38da43f0a2ea tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
110 |
Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
111 |
branch: default |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
112 |
commit: (clean) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
113 |
update: (current) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
114 |
topic: food |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
115 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
116 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
117 |
@ changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
118 |
tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
119 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
120 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
121 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
122 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
123 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
124 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
125 |
$ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
126 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
127 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
128 |
strict digraph "Mercurial graph" { |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
129 |
graph [rankdir=LR, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
130 |
splines=polyline |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
131 |
]; |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
132 |
node [label="\N"]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
133 |
0 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
134 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
135 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
136 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
137 |
label=0, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
138 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
139 |
pos="1,0!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
140 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
141 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
142 |
width=1]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
143 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
144 |
#endif |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
145 |
|
2825 | 146 |
Our next commit will be part of the active topic: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
147 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
148 |
$ cat >> shopping << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
149 |
> Egg |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
150 |
> Suggar |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
151 |
> Vinegar |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
152 |
> Oil |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
153 |
> EOF |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
154 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
155 |
$ hg commit -m "adding condiments" |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
156 |
active topic 'food' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3438
diff
changeset
|
157 |
(see 'hg help topics' for more information) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
158 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
159 |
$ hg log --graph --rev 'topic("food")' |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
160 |
@ changeset: 1:13900241408b |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
161 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
162 |
~ topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
163 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
164 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
165 |
summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
166 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
167 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
168 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
169 |
$ hg docgraph -r "topic("food")" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
170 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
171 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
172 |
strict digraph "Mercurial graph" { |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
173 |
graph [rankdir=LR, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
174 |
splines=polyline |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
175 |
]; |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
176 |
node [label="\N"]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
177 |
1 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
178 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
179 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
180 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
181 |
label=1, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
182 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
183 |
pos="1,1!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
184 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
185 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
186 |
width=1]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
187 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
188 |
#endif |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
189 |
|
2825 | 190 |
And future commits will be part of that topic too: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
191 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
192 |
$ cat >> shopping << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
193 |
> Bananas |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
194 |
> Pear |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
195 |
> Apple |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
196 |
> EOF |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
197 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
198 |
$ hg commit -m "adding fruits" |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
199 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
200 |
$ hg log --graph --rev 'topic("food")' |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
201 |
@ changeset: 2:287de11b401f |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
202 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
203 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
204 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
205 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
206 |
| summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
207 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
208 |
o changeset: 1:13900241408b |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
209 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
210 |
~ user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
211 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
212 |
summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
213 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
214 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
215 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
216 |
$ hg docgraph -r "topic("food")" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
217 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
218 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
219 |
strict digraph "Mercurial graph" { |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
220 |
graph [rankdir=LR, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
221 |
splines=polyline |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
222 |
]; |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
223 |
node [label="\N"]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
224 |
1 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
225 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
226 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
227 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
228 |
label=1, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
229 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
230 |
pos="1,1!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
231 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
232 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
233 |
width=1]; |
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
234 |
2 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
235 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
236 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
237 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
238 |
label=2, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
239 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
240 |
pos="1,2!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
241 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
242 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
243 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
244 |
1 -> 2 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
245 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
246 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
247 |
#endif |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
248 |
|
2721
c3a29c7abbee
tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2720
diff
changeset
|
249 |
We can get a compact view of the content of our topic using the ``stack`` |
2825 | 250 |
command: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
251 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
252 |
$ hg stack |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
253 |
### topic: food |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
254 |
### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
255 |
s2@ adding fruits (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
256 |
s1: adding condiments |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
257 |
s0^ Shopping list (base) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
258 |
|
2825 | 259 |
The topic deactivates when we update away from it: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
260 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
261 |
$ hg update default |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
262 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
263 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
264 |
$ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
265 |
food (2 changesets) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
266 |
|
2721
c3a29c7abbee
tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2720
diff
changeset
|
267 |
Note that ``default`` (name of the branch) now refers to the tipmost |
2825 | 268 |
changeset of default without a topic: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
269 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
270 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
271 |
o changeset: 2:287de11b401f |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
272 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
273 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
274 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
275 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
276 |
| summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
277 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
278 |
o changeset: 1:13900241408b |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
279 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
280 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
281 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
282 |
| summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
283 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
284 |
@ changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
285 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
286 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
287 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
288 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
289 |
|
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
290 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
291 |
$ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
292 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
293 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
294 |
strict digraph "Mercurial graph" { |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
295 |
graph [rankdir=LR, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
296 |
splines=polyline |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
297 |
]; |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
298 |
node [label="\N"]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
299 |
0 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
300 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
301 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
302 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
303 |
label=0, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
304 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
305 |
pos="1,0!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
306 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
307 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
308 |
width=1]; |
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
309 |
1 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
310 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
311 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
312 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
313 |
label=1, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
314 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
315 |
pos="1,1!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
316 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
317 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
318 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
319 |
0 -> 1 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
320 |
penwidth=2.0]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
321 |
2 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
322 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
323 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
324 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
325 |
label=2, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
326 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
327 |
pos="1,2!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
328 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
329 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
330 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
331 |
1 -> 2 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
332 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
333 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
334 |
#endif |
2825 | 335 |
And updating back to the topic reactivates it: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
336 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
337 |
$ hg update food |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
338 |
switching to topic food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
339 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
340 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
341 |
$ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
342 |
* food (2 changesets) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
343 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
344 |
Updating to any changeset that is part of a topic activates the topic |
2825 | 345 |
regardless of how the revision was specified: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
346 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
347 |
$ hg update default |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
348 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
349 |
|
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
350 |
$ hg update --rev 'desc("condiments")' |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
351 |
switching to topic food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
352 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
353 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
354 |
$ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
355 |
* food (2 changesets) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
356 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
357 |
.. Server side activity: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
358 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
359 |
$ cd ../server/ |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
360 |
$ cat > shopping << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
361 |
> T-Shirt |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
362 |
> Trousers |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
363 |
> Spam |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
364 |
> Whizzo butter |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
365 |
> Albatross |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
366 |
> Rat (rather a lot) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
367 |
> Jugged fish |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
368 |
> Blancmange |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
369 |
> Salmon mousse |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
370 |
> EOF |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
371 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
372 |
$ hg commit -A -m "Adding clothes" |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
373 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
374 |
$ cd ../client |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
375 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
376 |
The topic will also affect the rebase and the merge destinations. Let's pull |
2825 | 377 |
the latest update from the main server: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
378 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
379 |
$ hg pull |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
380 |
pulling from $TESTTMP/server (glob) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
381 |
searching for changes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
382 |
adding changesets |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
383 |
adding manifests |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
384 |
adding file changes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
385 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3060
diff
changeset
|
386 |
new changesets 6104862e8b84 |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
387 |
(run 'hg heads' to see heads) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
388 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
389 |
$ hg log -G |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
390 |
o changeset: 3:6104862e8b84 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
391 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
392 |
| parent: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
393 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
394 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
395 |
| summary: Adding clothes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
396 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
397 |
| o changeset: 2:287de11b401f |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
398 |
| | topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
399 |
| | user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
400 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
401 |
| | summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
402 |
| | |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
403 |
| @ changeset: 1:13900241408b |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
404 |
|/ topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
405 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
406 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
407 |
| summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
408 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
409 |
o changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
410 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
411 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
412 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
413 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
414 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
415 |
$ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
416 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
417 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
418 |
strict digraph "Mercurial graph" { |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
419 |
graph [rankdir=LR, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
420 |
splines=polyline |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
421 |
]; |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
422 |
node [label="\N"]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
423 |
0 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
424 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
425 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
426 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
427 |
label=0, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
428 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
429 |
pos="1,0!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
430 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
431 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
432 |
width=1]; |
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
433 |
1 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
434 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
435 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
436 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
437 |
label=1, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
438 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
439 |
pos="1,1!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
440 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
441 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
442 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
443 |
0 -> 1 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
444 |
penwidth=2.0]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
445 |
3 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
446 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
447 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
448 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
449 |
label=3, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
450 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
451 |
pos="1,3!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
452 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
453 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
454 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
455 |
0 -> 3 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
456 |
penwidth=2.0]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
457 |
2 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
458 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
459 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
460 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
461 |
label=2, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
462 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
463 |
pos="1,2!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
464 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
465 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
466 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
467 |
1 -> 2 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
468 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
469 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
470 |
#endif |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
471 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
472 |
The topic head will not be considered when merging from the new head of the |
2825 | 473 |
branch: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
474 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
475 |
$ hg update default |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
476 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
477 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
478 |
$ hg merge |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
479 |
abort: branch 'default' has one head - please merge with an explicit rev |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
480 |
(run 'hg heads' to see all heads) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
481 |
[255] |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
482 |
|
2825 | 483 |
But the topic will see that branch head as a valid destination: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
484 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
485 |
$ hg update food |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
486 |
switching to topic food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
487 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
488 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
489 |
$ hg rebase |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
490 |
rebasing 1:13900241408b "adding condiments" (food) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
491 |
merging shopping |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
492 |
switching to topic food |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
493 |
rebasing 2:287de11b401f "adding fruits" (food) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
494 |
merging shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
495 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
496 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
497 |
@ changeset: 5:2d50db8b5b4c |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
498 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
499 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
500 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
501 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
502 |
| summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
503 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
504 |
o changeset: 4:4011b46eeb33 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
505 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
506 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
507 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
508 |
| summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
509 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
510 |
o changeset: 3:6104862e8b84 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
511 |
| parent: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
512 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
513 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
514 |
| summary: Adding clothes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
515 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
516 |
o changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
517 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
518 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
519 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
520 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
521 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
522 |
$ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
523 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
524 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
525 |
strict digraph "Mercurial graph" { |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
526 |
graph [rankdir=LR, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
527 |
splines=polyline |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
528 |
]; |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
529 |
node [label="\N"]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
530 |
0 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
531 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
532 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
533 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
534 |
label=0, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
535 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
536 |
pos="1,0!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
537 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
538 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
539 |
width=1]; |
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
540 |
3 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
541 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
542 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
543 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
544 |
label=3, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
545 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
546 |
pos="1,3!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
547 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
548 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
549 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
550 |
0 -> 3 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
551 |
penwidth=2.0]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
552 |
4 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
553 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
554 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
555 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
556 |
label=4, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
557 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
558 |
pos="1,4!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
559 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
560 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
561 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
562 |
3 -> 4 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
563 |
penwidth=2.0]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
564 |
5 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
565 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
566 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
567 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
568 |
label=5, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
569 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
570 |
pos="1,5!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
571 |
shape=pentagon, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
572 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
573 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
574 |
4 -> 5 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
575 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
576 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
577 |
#endif |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
578 |
|
3384
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
579 |
There exists a template keyword named "topic" which can be used |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
580 |
|
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
581 |
$ hg log -GT "{rev}:{node|short} {topic}\n {desc}" |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
582 |
@ 5:2d50db8b5b4c food |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
583 |
| adding fruits |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
584 |
o 4:4011b46eeb33 food |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
585 |
| adding condiments |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
586 |
o 3:6104862e8b84 |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
587 |
| Adding clothes |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
588 |
o 0:38da43f0a2ea |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
589 |
Shopping list |
2b06f144b6e0
topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3377
diff
changeset
|
590 |
|
2825 | 591 |
The topic information will disappear when we publish the changesets: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
592 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
593 |
$ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
594 |
* food (2 changesets) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
595 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
596 |
$ hg push |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
597 |
pushing to $TESTTMP/server (glob) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
598 |
searching for changes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
599 |
adding changesets |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
600 |
adding manifests |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
601 |
adding file changes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
602 |
added 2 changesets with 2 changes to 1 files |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
603 |
2 new obsolescence markers |
2986
4746b92cc1f8
topics/ui: signal when an operation entails voiding a topic
Aurélien Campéas
parents:
2985
diff
changeset
|
604 |
active topic 'food' is now empty |
3770
eb928f5728c4
topic: suggest to clear a topic that becomes empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3769
diff
changeset
|
605 |
(use 'hg topic --clear' to clear it if needed) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
606 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
607 |
$ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
608 |
* food (0 changesets) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
609 |
|
2967
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
610 |
The topic still exists, and any new commit will be in the topic. But |
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
611 |
note that it is now devoid of any commit. |
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
612 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
613 |
$ hg topics --list |
2967
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
614 |
### topic: food |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
615 |
### target: default (branch) |
2967
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
616 |
(stack is empty) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
617 |
s0^ adding fruits (base current) |
2967
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
618 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
619 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
620 |
@ changeset: 5:2d50db8b5b4c |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
621 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
622 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
623 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
624 |
| summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
625 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
626 |
o changeset: 4:4011b46eeb33 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
627 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
628 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
629 |
| summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
630 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
631 |
o changeset: 3:6104862e8b84 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
632 |
| parent: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
633 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
634 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
635 |
| summary: Adding clothes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
636 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
637 |
o changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
638 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
639 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
640 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
641 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
642 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
643 |
$ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
644 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
645 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
646 |
strict digraph "Mercurial graph" { |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
647 |
graph [rankdir=LR, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
648 |
splines=polyline |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
649 |
]; |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
650 |
node [label="\N"]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
651 |
0 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
652 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
653 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
654 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
655 |
label=0, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
656 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
657 |
pos="1,0!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
658 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
659 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
660 |
width=1]; |
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
661 |
3 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
662 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
663 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
664 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
665 |
label=3, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
666 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
667 |
pos="1,3!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
668 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
669 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
670 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
671 |
0 -> 3 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
672 |
penwidth=2.0]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
673 |
4 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
674 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
675 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
676 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
677 |
label=4, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
678 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
679 |
pos="1,4!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
680 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
681 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
682 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
683 |
3 -> 4 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
684 |
penwidth=2.0]; |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
685 |
5 [fillcolor="#7F7FFF", |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
686 |
fixedsize=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
687 |
group=default, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
688 |
height=1, |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
689 |
label=5, |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
690 |
pin=true, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
691 |
pos="1,5!", |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
692 |
shape=circle, |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
693 |
style=filled, |
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
694 |
width=1]; |
2965
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
695 |
4 -> 5 [arrowhead=none, |
e036aab3d0cb
doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2959
diff
changeset
|
696 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
697 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
698 |
#endif |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
699 |
|
2967
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
700 |
If we update to the *default* head, we will leave the topic behind, |
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
701 |
and since it is commit-less, it will vanish. |
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
702 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
703 |
$ hg update default |
2984
30f6030dca8f
topics: signal to the end user when a topic has been forgotten
Aurélien Campéas
parents:
2979
diff
changeset
|
704 |
clearing empty topic "food" |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
705 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
706 |
|
2984
30f6030dca8f
topics: signal to the end user when a topic has been forgotten
Aurélien Campéas
parents:
2979
diff
changeset
|
707 |
From there, the topic has been completely forgotten. |
2967
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
708 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
709 |
$ hg topics |
2967
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
710 |
|
c62b3776fec3
topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents:
2966
diff
changeset
|
711 |
|
2968
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
712 |
Keep working within topics |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
713 |
========================== |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
714 |
|
3377
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
715 |
Making sure all your new local commit are made within a topic will help you |
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
716 |
organize your work. It is possible to ensure this through the Mercurial |
2968
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
717 |
configuration. |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
718 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
719 |
For this tutorial, we'll add the config at the repository level: |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
720 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
721 |
$ cat << EOF >> .hg/hgrc |
2972
33efe3a1be37
test: fix the enforce-topic configuration
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2971
diff
changeset
|
722 |
> [experimental] |
3021
5f4c42d4f2e8
test: update tests to use topic-mode enforce
Boris Feld <boris.feld@octobus.net>
parents:
3016
diff
changeset
|
723 |
> topic-mode = enforce |
2968
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
724 |
> EOF |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
725 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
726 |
You can also use `hg config --edit` to update your mercurial configuration. |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
727 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
728 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
729 |
Once enforcement is turned on. New local commit will be denied if no topic is active. |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
730 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
731 |
$ echo sickle >> shopping |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
732 |
$ hg commit -m 'Adding sickle' |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
733 |
abort: no active topic |
3027
b220e2f5ebd5
topic: update the topic-mode hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3021
diff
changeset
|
734 |
(see 'hg help -e topic.topic-mode' for details) |
2968
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
735 |
[255] |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
736 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
737 |
Ok, let's clean this up and delve into multiple topics. |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
738 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
739 |
$ hg revert . |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
740 |
reverting shopping |
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
741 |
|
946b1baa8c38
topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents:
2967
diff
changeset
|
742 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
743 |
Working with Multiple Topics |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
744 |
============================ |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
745 |
|
3377
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
746 |
In the above example, topics do not bring many benefits since you only have one |
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
747 |
line of development. Topics start to be more useful when you have to work on |
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
748 |
multiple features at the same time. |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
749 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
750 |
We might go shopping in a hardware store in the same go, so let's add some |
2825 | 751 |
tools to the shopping list within a new topic: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
752 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
753 |
$ hg topics tools |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2984
diff
changeset
|
754 |
marked working directory as topic: tools |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
755 |
$ echo hammer >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
756 |
$ hg commit -m 'Adding hammer' |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
757 |
active topic 'tools' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3438
diff
changeset
|
758 |
(see 'hg help topics' for more information) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
759 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
760 |
$ echo saw >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
761 |
$ hg commit -m 'Adding saw' |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
762 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
763 |
$ echo drill >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
764 |
$ hg commit -m 'Adding drill' |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
765 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
766 |
But we are not sure we will actually go to the hardware store, so in the |
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
767 |
meantime, we want to extend the list with drinks. We go back to the official |
2825 | 768 |
default branch and start a new topic: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
769 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
770 |
$ hg update default |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
771 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
772 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
773 |
$ hg topics drinks |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2984
diff
changeset
|
774 |
marked working directory as topic: drinks |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
775 |
$ echo 'apple juice' >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
776 |
$ hg commit -m 'Adding apple juice' |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
777 |
active topic 'drinks' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3438
diff
changeset
|
778 |
(see 'hg help topics' for more information) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
779 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
780 |
$ echo 'orange juice' >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
781 |
$ hg commit -m 'Adding orange juice' |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
782 |
|
2825 | 783 |
We now have two topics: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
784 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
785 |
$ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
786 |
* drinks (2 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3027
diff
changeset
|
787 |
tools (3 changesets) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
788 |
|
2825 | 789 |
The information displayed by ``hg stack`` adapts to the active topic: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
790 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
791 |
$ hg stack |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
792 |
### topic: drinks |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
793 |
### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
794 |
s2@ Adding orange juice (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
795 |
s1: Adding apple juice |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
796 |
s0^ adding fruits (base) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
797 |
|
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
798 |
$ hg update tools |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
799 |
switching to topic tools |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
800 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
801 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
802 |
$ hg stack |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
803 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
804 |
### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
805 |
s3@ Adding drill (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
806 |
s2: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
807 |
s1: Adding hammer |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
808 |
s0^ adding fruits (base) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
809 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
810 |
They are seen as independent branches by Mercurial. No rebase or merge |
2825 | 811 |
between them will be attempted by default: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
812 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
813 |
$ hg rebase |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
814 |
nothing to rebase |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
815 |
[1] |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
816 |
|
2970
19e20e86a514
topics/tuto: slightly more verbose explanation of what we are seeing
Aurélien Campéas
parents:
2969
diff
changeset
|
817 |
We simulate independant contributions to the repo with this |
19e20e86a514
topics/tuto: slightly more verbose explanation of what we are seeing
Aurélien Campéas
parents:
2969
diff
changeset
|
818 |
activity: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
819 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
820 |
$ cd ../server |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
821 |
$ hg update |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
822 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
823 |
$ mv shopping foo |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
824 |
$ echo 'Coat' > shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
825 |
$ cat foo >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
826 |
$ hg commit -m 'add a coat' |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
827 |
$ echo 'Coat' > shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
828 |
$ echo 'Shoes' >> shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
829 |
$ cat foo >> shopping |
2720
db3830646e34
tutorial: use rm instead of 'hg rm' for an untracked temporary file
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2679
diff
changeset
|
830 |
$ rm foo |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
831 |
$ hg commit -m 'add a pair of shoes' |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
832 |
$ cd ../client |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
833 |
|
2970
19e20e86a514
topics/tuto: slightly more verbose explanation of what we are seeing
Aurélien Campéas
parents:
2969
diff
changeset
|
834 |
Let's discover what other people did contribute: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
835 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
836 |
$ hg pull |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
837 |
pulling from $TESTTMP/server (glob) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
838 |
searching for changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
839 |
adding changesets |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
840 |
adding manifests |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
841 |
adding file changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
842 |
added 2 changesets with 2 changes to 1 files (+1 heads) |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3060
diff
changeset
|
843 |
new changesets f2d6cacc6115:fbff9bc37a43 |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
844 |
(run 'hg heads' to see heads) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
845 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
846 |
There are new changes! We can simply use ``hg rebase`` to update our |
2825 | 847 |
changeset on top of the latest: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
848 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
849 |
$ hg log -G |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
850 |
o changeset: 12:fbff9bc37a43 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
851 |
| tag: tip |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
852 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
853 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
854 |
| summary: add a pair of shoes |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
855 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
856 |
o changeset: 11:f2d6cacc6115 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
857 |
| parent: 5:2d50db8b5b4c |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
858 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
859 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
860 |
| summary: add a coat |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
861 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
862 |
| o changeset: 10:70dfa201ed73 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
863 |
| | topic: drinks |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
864 |
| | user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
865 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
866 |
| | summary: Adding orange juice |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
867 |
| | |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
868 |
| o changeset: 9:8dfa45bd5e0c |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
869 |
|/ topic: drinks |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
870 |
| parent: 5:2d50db8b5b4c |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
871 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
872 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
873 |
| summary: Adding apple juice |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
874 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
875 |
| @ changeset: 8:34255b455dac |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
876 |
| | topic: tools |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
877 |
| | user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
878 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
879 |
| | summary: Adding drill |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
880 |
| | |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
881 |
| o changeset: 7:cffff85af537 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
882 |
| | topic: tools |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
883 |
| | user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
884 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
885 |
| | summary: Adding saw |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
886 |
| | |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
887 |
| o changeset: 6:183984ef46d1 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
888 |
|/ topic: tools |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
889 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
890 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
891 |
| summary: Adding hammer |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
892 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
893 |
o changeset: 5:2d50db8b5b4c |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
894 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
895 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
896 |
| summary: adding fruits |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
897 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
898 |
o changeset: 4:4011b46eeb33 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
899 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
900 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
901 |
| summary: adding condiments |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
902 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
903 |
o changeset: 3:6104862e8b84 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
904 |
| parent: 0:38da43f0a2ea |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
905 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
906 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
907 |
| summary: Adding clothes |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
908 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
909 |
o changeset: 0:38da43f0a2ea |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
910 |
user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
911 |
date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
912 |
summary: Shopping list |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
913 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
914 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
915 |
$ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
916 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
917 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
918 |
strict digraph "Mercurial graph" { |
3434
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
919 |
graph [rankdir=LR, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
920 |
splines=polyline |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
921 |
]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
922 |
node [label="\N"]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
923 |
0 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
924 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
925 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
926 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
927 |
label=0, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
928 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
929 |
pos="1,0!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
930 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
931 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
932 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
933 |
3 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
934 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
935 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
936 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
937 |
label=3, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
938 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
939 |
pos="1,3!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
940 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
941 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
942 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
943 |
0 -> 3 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
944 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
945 |
4 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
946 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
947 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
948 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
949 |
label=4, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
950 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
951 |
pos="1,4!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
952 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
953 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
954 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
955 |
3 -> 4 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
956 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
957 |
5 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
958 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
959 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
960 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
961 |
label=5, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
962 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
963 |
pos="1,5!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
964 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
965 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
966 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
967 |
4 -> 5 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
968 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
969 |
6 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
970 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
971 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
972 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
973 |
label=6, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
974 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
975 |
pos="1,6!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
976 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
977 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
978 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
979 |
5 -> 6 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
980 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
981 |
9 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
982 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
983 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
984 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
985 |
label=9, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
986 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
987 |
pos="1,9!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
988 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
989 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
990 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
991 |
5 -> 9 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
992 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
993 |
11 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
994 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
995 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
996 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
997 |
label=11, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
998 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
999 |
pos="1,11!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1000 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1001 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1002 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1003 |
5 -> 11 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1004 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1005 |
7 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1006 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1007 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1008 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1009 |
label=7, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1010 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1011 |
pos="1,7!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1012 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1013 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1014 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1015 |
6 -> 7 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1016 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1017 |
8 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1018 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1019 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1020 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1021 |
label=8, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1022 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1023 |
pos="1,8!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1024 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1025 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1026 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1027 |
7 -> 8 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1028 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1029 |
10 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1030 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1031 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1032 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1033 |
label=10, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1034 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1035 |
pos="1,10!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1036 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1037 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1038 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1039 |
9 -> 10 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1040 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1041 |
12 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1042 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1043 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1044 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1045 |
label=12, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1046 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1047 |
pos="1,12!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1048 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1049 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1050 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1051 |
11 -> 12 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1052 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1053 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1054 |
#endif |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1055 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1056 |
$ hg rebase |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
1057 |
rebasing 6:183984ef46d1 "Adding hammer" (tools) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1058 |
merging shopping |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
1059 |
switching to topic tools |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
1060 |
rebasing 7:cffff85af537 "Adding saw" (tools) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1061 |
merging shopping |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
1062 |
rebasing 8:34255b455dac "Adding drill" (tools) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1063 |
merging shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1064 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
1065 |
But what about the other topic? You can use 'hg topics --verbose' to see |
2825 | 1066 |
information about all the topics: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1067 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
1068 |
$ hg topics --verbose |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1069 |
drinks (on branch: default, 2 changesets, 2 behind) |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
1070 |
* tools (on branch: default, 3 changesets) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1071 |
|
2886
00518926094f
topic: reword and simplify explanation of "behind"
Aurélien Campéas
parents:
2885
diff
changeset
|
1072 |
The "2 behind" is telling you that there are 2 new changesets over the base of the topic. |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1073 |
|
2825 | 1074 |
Pushing that topic would create a new head, and therefore will be prevented: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1075 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1076 |
$ hg push --rev drinks |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
1077 |
pushing to $TESTTMP/server (glob) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1078 |
searching for changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1079 |
abort: push creates new remote head 70dfa201ed73! |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1080 |
(merge or see 'hg help push' for details about pushing new heads) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1081 |
[255] |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1082 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1083 |
|
2971
222ad649380b
topics/tuto: clarification on the scope of the tutorial
Aurélien Campéas
parents:
2970
diff
changeset
|
1084 |
Even after a rebase, pushing all active topics at the same time would publish |
222ad649380b
topics/tuto: clarification on the scope of the tutorial
Aurélien Campéas
parents:
2970
diff
changeset
|
1085 |
them to the default branch, and then mercurial would complain about the |
222ad649380b
topics/tuto: clarification on the scope of the tutorial
Aurélien Campéas
parents:
2970
diff
changeset
|
1086 |
multiple *public* heads it would create on that branch: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1087 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1088 |
$ hg rebase -b drinks |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
1089 |
rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1090 |
merging shopping |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
1091 |
switching to topic drinks |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
1092 |
rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1093 |
merging shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1094 |
switching to topic tools |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
1095 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1096 |
$ hg push |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
1097 |
pushing to $TESTTMP/server (glob) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1098 |
searching for changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1099 |
abort: push creates new remote head 4cd7c1591a67! |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1100 |
(merge or see 'hg help push' for details about pushing new heads) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1101 |
[255] |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1102 |
|
2721
c3a29c7abbee
tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2720
diff
changeset
|
1103 |
Publishing only one of them is allowed (as long as it does not create a new |
2825 | 1104 |
branch head as we just saw in the previous case): |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1105 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1106 |
$ hg push -r drinks |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
1107 |
pushing to $TESTTMP/server (glob) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1108 |
searching for changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1109 |
adding changesets |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1110 |
adding manifests |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1111 |
adding file changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1112 |
added 2 changesets with 2 changes to 1 files |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1113 |
2 new obsolescence markers |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1114 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
1115 |
The published topic has now disappeared, and the other is now marked as |
2825 | 1116 |
"behind": |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1117 |
|
2969
3d39b8867b29
topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents:
2968
diff
changeset
|
1118 |
$ hg topics --verbose |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1119 |
* tools (on branch: default, 3 changesets, 2 behind) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
1120 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1121 |
$ hg stack |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1122 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1123 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1124 |
s3@ Adding drill (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1125 |
s2: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1126 |
s1: Adding hammer |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1127 |
s0^ add a pair of shoes (base) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
1128 |
|
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1129 |
Working Within Your Stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1130 |
=========================== |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1131 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1132 |
Navigating within your stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1133 |
---------------------------- |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1134 |
|
2885 | 1135 |
As we saw before `stack` displays changesets on your current topic in a clean way: |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1136 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1137 |
$ hg topics --verbose |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1138 |
* tools (on branch: default, 3 changesets, 2 behind) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1139 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1140 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1141 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1142 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1143 |
s3@ Adding drill (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1144 |
s2: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1145 |
s1: Adding hammer |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1146 |
s0^ add a pair of shoes (base) |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1147 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1148 |
You can navigate in your current stack with `previous` and `next`. |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1149 |
|
2973
0192d6bc25fa
topics/tuto: try to be more clear when explaining previous/next
Aurélien Campéas
parents:
2972
diff
changeset
|
1150 |
`previous` will bring you back to the parent of the topic head. |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1151 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1152 |
$ hg previous |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1153 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4161
3c28f8a3a5a5
prev: also use stack shortcut in output when possible
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4160
diff
changeset
|
1154 |
[s2] Adding saw |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1155 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1156 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1157 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1158 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1159 |
s3: Adding drill |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1160 |
s2@ Adding saw (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1161 |
s1: Adding hammer |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1162 |
s0^ add a pair of shoes (base) |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1163 |
|
2973
0192d6bc25fa
topics/tuto: try to be more clear when explaining previous/next
Aurélien Campéas
parents:
2972
diff
changeset
|
1164 |
`next` will move you forward to the topic head. |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1165 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1166 |
$ hg next |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1167 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4160
44133463372f
next: also use stack shortcut in output when possible
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4093
diff
changeset
|
1168 |
[s3] Adding drill |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1169 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1170 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1171 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1172 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1173 |
s3@ Adding drill (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1174 |
s2: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1175 |
s1: Adding hammer |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1176 |
s0^ add a pair of shoes (base) |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1177 |
|
2974
af37cdaa84ee
topics/tuto: attempt to have a slightly more clear wording
Aurélien Campéas
parents:
2973
diff
changeset
|
1178 |
You can also directly jump to a changeset within your stack with the revset `t#`. |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1179 |
|
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
1180 |
$ hg update s1 |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1181 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1182 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1183 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1184 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1185 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1186 |
s3: Adding drill |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1187 |
s2: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1188 |
s1@ Adding hammer (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1189 |
s0^ add a pair of shoes (base) |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1190 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1191 |
Editing your work mid-stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1192 |
--------------------------- |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1193 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1194 |
It's easy to edit your work inside your stack: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1195 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1196 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1197 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1198 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1199 |
s3: Adding drill |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1200 |
s2: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1201 |
s1@ Adding hammer (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1202 |
s0^ add a pair of shoes (base) |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1203 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1204 |
$ hg amend -m "Adding hammer to the shopping list" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1205 |
2 new orphan changesets |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1206 |
|
2975
7964b9138549
topics/tuto: try to be more precise on why `hg log` output is hairy
Aurélien Campéas
parents:
2974
diff
changeset
|
1207 |
Understanding the current situation with hg log is not so easy, because |
7964b9138549
topics/tuto: try to be more precise on why `hg log` output is hairy
Aurélien Campéas
parents:
2974
diff
changeset
|
1208 |
it shows too many things: |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1209 |
|
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
1210 |
$ hg log -G -r "s0::" |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1211 |
@ changeset: 18:b7509bd417f8 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1212 |
| tag: tip |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1213 |
| topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1214 |
| parent: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1215 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1216 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1217 |
| summary: Adding hammer to the shopping list |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1218 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1219 |
| o changeset: 17:4cd7c1591a67 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1220 |
| | user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1221 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1222 |
| | summary: Adding orange juice |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1223 |
| | |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1224 |
| o changeset: 16:20759cb47ff8 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1225 |
|/ parent: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1226 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1227 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1228 |
| summary: Adding apple juice |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1229 |
| |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
1230 |
| * changeset: 15:bb1e6254f532 |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1231 |
| | topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1232 |
| | user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1233 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1234 |
| | instability: orphan |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1235 |
| | summary: Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1236 |
| | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
1237 |
| * changeset: 14:d4f97f32f8a1 |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1238 |
| | topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1239 |
| | user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1240 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1241 |
| | instability: orphan |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1242 |
| | summary: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1243 |
| | |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1244 |
| x changeset: 13:a8ab3599d53d |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1245 |
|/ topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1246 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1247 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3085
diff
changeset
|
1248 |
| obsolete: reworded using amend as 18:b7509bd417f8 |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1249 |
| summary: Adding hammer |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1250 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1251 |
o changeset: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1252 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1253 |
~ date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1254 |
summary: add a pair of shoes |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1255 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1256 |
|
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1257 |
#if docgraph-ext |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
1258 |
$ hg docgraph -r "s0::" --sphinx-directive --rankdir LR #rest-ignore |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1259 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1260 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
1261 |
strict digraph "Mercurial graph" { |
3434
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1262 |
graph [rankdir=LR, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1263 |
splines=polyline |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1264 |
]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1265 |
node [label="\N"]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1266 |
12 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1267 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1268 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1269 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1270 |
label=12, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1271 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1272 |
pos="1,12!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1273 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1274 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1275 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1276 |
13 [fillcolor="#DFDFFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1277 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1278 |
group=default_alt, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1279 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1280 |
label=13, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1281 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1282 |
pos="2,13!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1283 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1284 |
style="dotted, filled", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1285 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1286 |
12 -> 13 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1287 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1288 |
18 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1289 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1290 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1291 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1292 |
label=18, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1293 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1294 |
pos="1,18!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1295 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1296 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1297 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1298 |
12 -> 18 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1299 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1300 |
16 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1301 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1302 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1303 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1304 |
label=16, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1305 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1306 |
pos="1,16!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1307 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1308 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1309 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1310 |
12 -> 16 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1311 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1312 |
13 -> 18 [arrowtail=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1313 |
dir=back, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1314 |
minlen=0, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1315 |
penwidth=2.0, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1316 |
style=dashed]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1317 |
14 [fillcolor="#FF4F4F", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1318 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1319 |
group=default_alt, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1320 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1321 |
label=14, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1322 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1323 |
pos="2,14!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1324 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1325 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1326 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1327 |
13 -> 14 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1328 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1329 |
15 [fillcolor="#FF4F4F", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1330 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1331 |
group=default_alt, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1332 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1333 |
label=15, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1334 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1335 |
pos="2,15!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1336 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1337 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1338 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1339 |
14 -> 15 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1340 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1341 |
17 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1342 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1343 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1344 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1345 |
label=17, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1346 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1347 |
pos="1,17!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1348 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1349 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1350 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1351 |
16 -> 17 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1352 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1353 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1354 |
#endif |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1355 |
|
2885 | 1356 |
Fortunately stack shows you a better visualization: |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1357 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1358 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1359 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1360 |
### target: default (branch), 2 behind |
4432
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4342
diff
changeset
|
1361 |
s3$ Adding drill (orphan) |
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4342
diff
changeset
|
1362 |
s2$ Adding saw (orphan) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1363 |
s1@ Adding hammer to the shopping list (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1364 |
s0^ add a pair of shoes (base) |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1365 |
|
2976
e5edfb5aba0c
topics/tuto: be more complete over the de-orphaning action within a topic
Aurélien Campéas
parents:
2975
diff
changeset
|
1366 |
It's easy to stabilize the situation, `next` has an `--evolve` option. It will |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
1367 |
do the necessary relocation of `s2` and `s3` over the new `s1` without having |
2976
e5edfb5aba0c
topics/tuto: be more complete over the de-orphaning action within a topic
Aurélien Campéas
parents:
2975
diff
changeset
|
1368 |
to do that rebase by hand.: |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1369 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1370 |
$ hg next --evolve |
4342
914b9e55f76e
next: populate stacktemplate to the missed _nextevolve function
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4181
diff
changeset
|
1371 |
move:[s2] Adding saw |
914b9e55f76e
next: populate stacktemplate to the missed _nextevolve function
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4181
diff
changeset
|
1372 |
atop:[s1] Adding hammer to the shopping list |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1373 |
working directory now at d5c51ee5762a |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1374 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1375 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1376 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1377 |
### target: default (branch), 2 behind |
4432
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4342
diff
changeset
|
1378 |
s3$ Adding drill (orphan) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1379 |
s2@ Adding saw (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1380 |
s1: Adding hammer to the shopping list |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1381 |
s0^ add a pair of shoes (base) |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1382 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1383 |
One more to go: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1384 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1385 |
$ hg next --evolve |
4342
914b9e55f76e
next: populate stacktemplate to the missed _nextevolve function
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4181
diff
changeset
|
1386 |
move:[s3] Adding drill |
914b9e55f76e
next: populate stacktemplate to the missed _nextevolve function
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4181
diff
changeset
|
1387 |
atop:[s2] Adding saw |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1388 |
working directory now at bae3758e46bf |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1389 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1390 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1391 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1392 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1393 |
s3@ Adding drill (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1394 |
s2: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1395 |
s1: Adding hammer to the shopping list |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1396 |
s0^ add a pair of shoes (base) |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1397 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1398 |
Let's take a look at `hg log` once again: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1399 |
|
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
1400 |
$ hg log -G -r "s0::" |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1401 |
@ changeset: 20:bae3758e46bf |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1402 |
| tag: tip |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1403 |
| topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1404 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1405 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1406 |
| summary: Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1407 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1408 |
o changeset: 19:d5c51ee5762a |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1409 |
| topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1410 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1411 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1412 |
| summary: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1413 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1414 |
o changeset: 18:b7509bd417f8 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1415 |
| topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1416 |
| parent: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1417 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1418 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1419 |
| summary: Adding hammer to the shopping list |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1420 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1421 |
| o changeset: 17:4cd7c1591a67 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1422 |
| | user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1423 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1424 |
| | summary: Adding orange juice |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1425 |
| | |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1426 |
| o changeset: 16:20759cb47ff8 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1427 |
|/ parent: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1428 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1429 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1430 |
| summary: Adding apple juice |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1431 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1432 |
o changeset: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1433 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1434 |
~ date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1435 |
summary: add a pair of shoes |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1436 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1437 |
|
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1438 |
#if docgraph-ext |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
1439 |
$ hg docgraph -r "s0::" --sphinx-directive --rankdir LR #rest-ignore |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1440 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1441 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
1442 |
strict digraph "Mercurial graph" { |
3434
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1443 |
graph [rankdir=LR, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1444 |
splines=polyline |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1445 |
]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1446 |
node [label="\N"]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1447 |
12 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1448 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1449 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1450 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1451 |
label=12, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1452 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1453 |
pos="1,12!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1454 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1455 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1456 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1457 |
16 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1458 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1459 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1460 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1461 |
label=16, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1462 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1463 |
pos="1,16!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1464 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1465 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1466 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1467 |
12 -> 16 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1468 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1469 |
18 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1470 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1471 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1472 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1473 |
label=18, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1474 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1475 |
pos="1,18!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1476 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1477 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1478 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1479 |
12 -> 18 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1480 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1481 |
17 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1482 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1483 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1484 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1485 |
label=17, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1486 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1487 |
pos="1,17!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1488 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1489 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1490 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1491 |
16 -> 17 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1492 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1493 |
19 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1494 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1495 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1496 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1497 |
label=19, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1498 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1499 |
pos="1,19!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1500 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1501 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1502 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1503 |
18 -> 19 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1504 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1505 |
20 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1506 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1507 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1508 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1509 |
label=20, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1510 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1511 |
pos="1,20!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1512 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1513 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1514 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1515 |
19 -> 20 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1516 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1517 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1518 |
#endif |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1519 |
Multi-headed stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1520 |
------------------ |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1521 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1522 |
Stack is also very helpful when you have a multi-headed stack: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1523 |
|
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
1524 |
$ hg up s1 |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1525 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1526 |
|
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1527 |
$ echo "nails" > new_shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1528 |
$ cat shopping >> new_shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1529 |
$ mv new_shopping shopping |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1530 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1531 |
$ hg commit -m 'Adding nails' |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1532 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1533 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
1534 |
### topic: tools (2 heads) |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1535 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1536 |
s4: Adding drill |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1537 |
s3: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1538 |
s1^ Adding hammer to the shopping list (base) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1539 |
s2@ Adding nails (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1540 |
s1: Adding hammer to the shopping list |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1541 |
s0^ add a pair of shoes (base) |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1542 |
|
2885 | 1543 |
Solving this situation is easy with a topic: use merge or rebase. |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1544 |
Merge within a multi-headed stack will use the other topic head as |
2978
9280e78dbcba
topics/tuto: prefer rebase over merge and remove the weird merge attempt
Aurélien Campéas
parents:
2977
diff
changeset
|
1545 |
destination if the topic has two heads. But rebasing will yield a |
9280e78dbcba
topics/tuto: prefer rebase over merge and remove the weird merge attempt
Aurélien Campéas
parents:
2977
diff
changeset
|
1546 |
completely linear history so it's what we will do. |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1547 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1548 |
$ hg log -G |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1549 |
@ changeset: 21:f936c6da9d61 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1550 |
| tag: tip |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1551 |
| topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1552 |
| parent: 18:b7509bd417f8 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1553 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1554 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1555 |
| summary: Adding nails |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1556 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1557 |
| o changeset: 20:bae3758e46bf |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1558 |
| | topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1559 |
| | user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1560 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1561 |
| | summary: Adding drill |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1562 |
| | |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1563 |
| o changeset: 19:d5c51ee5762a |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1564 |
|/ topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1565 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1566 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1567 |
| summary: Adding saw |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1568 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1569 |
o changeset: 18:b7509bd417f8 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1570 |
| topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1571 |
| parent: 12:fbff9bc37a43 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1572 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1573 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1574 |
| summary: Adding hammer to the shopping list |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1575 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1576 |
| o changeset: 17:4cd7c1591a67 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1577 |
| | user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1578 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1579 |
| | summary: Adding orange juice |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1580 |
| | |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1581 |
| o changeset: 16:20759cb47ff8 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1582 |
|/ parent: 12:fbff9bc37a43 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1583 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1584 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1585 |
| summary: Adding apple juice |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1586 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1587 |
o changeset: 12:fbff9bc37a43 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1588 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1589 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1590 |
| summary: add a pair of shoes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1591 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1592 |
o changeset: 11:f2d6cacc6115 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1593 |
| parent: 5:2d50db8b5b4c |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1594 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1595 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1596 |
| summary: add a coat |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1597 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1598 |
o changeset: 5:2d50db8b5b4c |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1599 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1600 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1601 |
| summary: adding fruits |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1602 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1603 |
o changeset: 4:4011b46eeb33 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1604 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1605 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1606 |
| summary: adding condiments |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1607 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1608 |
o changeset: 3:6104862e8b84 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1609 |
| parent: 0:38da43f0a2ea |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1610 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1611 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1612 |
| summary: Adding clothes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1613 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1614 |
o changeset: 0:38da43f0a2ea |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1615 |
user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1616 |
date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1617 |
summary: Shopping list |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1618 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1619 |
|
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1620 |
#if docgraph-ext |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1621 |
$ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1622 |
.. graphviz:: |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1623 |
|
3316
76e5b5ae6864
docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
1624 |
strict digraph "Mercurial graph" { |
3434
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1625 |
graph [rankdir=LR, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1626 |
splines=polyline |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1627 |
]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1628 |
node [label="\N"]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1629 |
0 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1630 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1631 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1632 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1633 |
label=0, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1634 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1635 |
pos="1,0!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1636 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1637 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1638 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1639 |
3 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1640 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1641 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1642 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1643 |
label=3, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1644 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1645 |
pos="1,3!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1646 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1647 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1648 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1649 |
0 -> 3 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1650 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1651 |
4 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1652 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1653 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1654 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1655 |
label=4, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1656 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1657 |
pos="1,4!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1658 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1659 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1660 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1661 |
3 -> 4 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1662 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1663 |
5 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1664 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1665 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1666 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1667 |
label=5, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1668 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1669 |
pos="1,5!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1670 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1671 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1672 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1673 |
4 -> 5 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1674 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1675 |
11 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1676 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1677 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1678 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1679 |
label=11, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1680 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1681 |
pos="1,11!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1682 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1683 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1684 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1685 |
5 -> 11 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1686 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1687 |
12 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1688 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1689 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1690 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1691 |
label=12, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1692 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1693 |
pos="1,12!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1694 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1695 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1696 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1697 |
11 -> 12 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1698 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1699 |
16 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1700 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1701 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1702 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1703 |
label=16, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1704 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1705 |
pos="1,16!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1706 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1707 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1708 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1709 |
12 -> 16 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1710 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1711 |
18 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1712 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1713 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1714 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1715 |
label=18, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1716 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1717 |
pos="1,18!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1718 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1719 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1720 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1721 |
12 -> 18 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1722 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1723 |
17 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1724 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1725 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1726 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1727 |
label=17, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1728 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1729 |
pos="1,17!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1730 |
shape=circle, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1731 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1732 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1733 |
16 -> 17 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1734 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1735 |
19 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1736 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1737 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1738 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1739 |
label=19, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1740 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1741 |
pos="1,19!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1742 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1743 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1744 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1745 |
18 -> 19 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1746 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1747 |
21 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1748 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1749 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1750 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1751 |
label=21, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1752 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1753 |
pos="1,21!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1754 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1755 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1756 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1757 |
18 -> 21 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1758 |
penwidth=2.0]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1759 |
20 [fillcolor="#7F7FFF", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1760 |
fixedsize=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1761 |
group=default, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1762 |
height=1, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1763 |
label=20, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1764 |
pin=true, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1765 |
pos="1,20!", |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1766 |
shape=pentagon, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1767 |
style=filled, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1768 |
width=1]; |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1769 |
19 -> 20 [arrowhead=none, |
100bfaafbd3b
tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents:
3411
diff
changeset
|
1770 |
penwidth=2.0]; |
2959
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1771 |
} |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1772 |
#endif |
ef361938dfa1
doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
2951
diff
changeset
|
1773 |
|
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
1774 |
$ hg up s4 |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1775 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1776 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1777 |
$ hg rebase |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
1778 |
rebasing 19:d5c51ee5762a "Adding saw" (tools) |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1779 |
merging shopping |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
1780 |
rebasing 20:bae3758e46bf "Adding drill" (tools) |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1781 |
merging shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1782 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1783 |
$ hg stack |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1784 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1785 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1786 |
s4@ Adding drill (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1787 |
s3: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1788 |
s2: Adding nails |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1789 |
s1: Adding hammer to the shopping list |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1790 |
s0^ add a pair of shoes (base) |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1791 |
|
2885 | 1792 |
Collaborating through a non-publishing server |
2966
d1d47e025dd3
topics/tuto: fix title underline type introduced earlier
Aurélien Campéas
parents:
2965
diff
changeset
|
1793 |
============================================= |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1794 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1795 |
.. setup: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1796 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1797 |
.. Let's create a non-publishing server: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1798 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1799 |
$ cd .. |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1800 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1801 |
$ hg clone server non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1802 |
updating to branch default |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1803 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1804 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1805 |
$ cd non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1806 |
$ cat >> .hg/hgrc << EOF |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1807 |
> [phases] |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1808 |
> publish = false |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1809 |
> EOF |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1810 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1811 |
.. And another client: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1812 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1813 |
$ cd .. |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1814 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1815 |
$ hg clone server other-client |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1816 |
updating to branch default |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1817 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1818 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1819 |
$ cd client |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1820 |
|
2885 | 1821 |
We can now share these draft changesets: |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1822 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1823 |
$ hg push ../non-publishing-server -r tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1824 |
pushing to ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1825 |
searching for changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1826 |
adding changesets |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1827 |
adding manifests |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1828 |
adding file changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1829 |
added 4 changesets with 4 changes to 1 files (+1 heads) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1830 |
8 new obsolescence markers |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1831 |
|
3377
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
1832 |
Pushing the new topic branch to a non-publishing server did not require |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1833 |
--force. As long as new heads are on their own topic, Mercurial will not |
2885 | 1834 |
complain about them. |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1835 |
|
2885 | 1836 |
From another client, we will get them with their topic: |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1837 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1838 |
$ cd ../other-client |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1839 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1840 |
$ hg pull ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1841 |
pulling from ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1842 |
searching for changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1843 |
adding changesets |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1844 |
adding manifests |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1845 |
adding file changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1846 |
added 4 changesets with 4 changes to 1 files (+1 heads) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1847 |
8 new obsolescence markers |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
1848 |
new changesets b7509bd417f8:2d084ac00115 (4 drafts) |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1849 |
(run 'hg heads' to see heads) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1850 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1851 |
$ hg topics --verbose |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1852 |
tools (on branch: default, 4 changesets, 2 behind) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1853 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1854 |
$ hg up tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1855 |
switching to topic tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1856 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1857 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1858 |
$ hg stack |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1859 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1860 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1861 |
s4@ Adding drill (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1862 |
s3: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1863 |
s2: Adding nails |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1864 |
s1: Adding hammer to the shopping list |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1865 |
s0^ add a pair of shoes (base) |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1866 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1867 |
We can also add new changesets and share them: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1868 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1869 |
$ echo screws >> shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1870 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1871 |
$ hg commit -A -m "Adding screws" |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1872 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1873 |
$ hg push ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1874 |
pushing to ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1875 |
searching for changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1876 |
adding changesets |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1877 |
adding manifests |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1878 |
adding file changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1879 |
added 1 changesets with 1 changes to 1 files |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1880 |
|
3377
4f75e0a5d82d
Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
3359
diff
changeset
|
1881 |
And retrieve them from the first client: |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1882 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1883 |
$ cd ../client |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1884 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1885 |
$ hg pull ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1886 |
pulling from ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1887 |
searching for changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1888 |
adding changesets |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1889 |
adding manifests |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1890 |
adding file changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1891 |
added 1 changesets with 1 changes to 1 files |
4181
ab3581bc0637
branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4165
diff
changeset
|
1892 |
new changesets 0d409663a1fd (1 drafts) |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1893 |
(run 'hg update' to get a working copy) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1894 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1895 |
$ hg update |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1896 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1897 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1898 |
$ hg stack |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1899 |
### topic: tools |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
1900 |
### target: default (branch), 2 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1901 |
s5@ Adding screws (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1902 |
s4: Adding drill |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1903 |
s3: Adding saw |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1904 |
s2: Adding nails |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1905 |
s1: Adding hammer to the shopping list |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
1906 |
s0^ add a pair of shoes (base) |