tests/test-topic-tutorial.t
author Sean Farley <sean@farley.io>
Tue, 19 Dec 2017 13:15:00 -0600
changeset 3518 d938808e31bc
parent 3438 52440d67921c
child 3590 d5adce52cef4
child 3769 1bc4b0807c37
permissions -rw-r--r--
serverminitopic: attempt to fix assertion for repoview in branchmap This seems fine since we topic never impact public only caches.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
    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
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
    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
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
    96
We are about to make some additions to this list and would like to do them
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
    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
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
   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
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   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
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   157
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
   158
  $ 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
   159
  @  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
   160
  |  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
   161
  ~  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
   162
     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
   163
     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
   164
     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
   165
  
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
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   167
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   168
  $ 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
   169
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   170
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   171
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   172
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   173
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   174
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   175
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   176
      	1	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   177
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   178
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   179
      		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
   180
      		label=1,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   181
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   182
      		pos="1,1!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   183
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   184
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   185
      		width=1];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   186
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   187
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   188
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   189
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
   190
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
  $ 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
   192
  > 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
   193
  > 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
   194
  > 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
   195
  > EOF
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   196
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
   197
  $ hg commit -m "adding fruits"
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   198
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
   199
  $ 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
   200
  @  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
   201
  |  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
   202
  |  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
   203
  |  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
   204
  |  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
   205
  |  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
   206
  |
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
  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
   208
  |  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
   209
  ~  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
   210
     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
   211
     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
   212
  
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
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   214
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   215
  $ 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
   216
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   217
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   218
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   219
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   220
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   221
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   222
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   223
      	1	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   224
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   225
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   226
      		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
   227
      		label=1,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   228
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   229
      		pos="1,1!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   230
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   231
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   232
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   233
      	2	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   234
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   235
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   236
      		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
   237
      		label=2,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   238
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   239
      		pos="1,2!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   240
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   241
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   242
      		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
   243
      	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
   244
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   245
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   246
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   247
2721
c3a29c7abbee tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2720
diff changeset
   248
We can get a compact view of the content of our topic using the ``stack``
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   249
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
   250
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
  $ 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
   252
  ### 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
   253
  ### target: default (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
   254
  t2@ adding fruits (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
   255
  t1: adding condiments
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2679
diff changeset
   256
  t0^ 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
   257
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   258
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
   259
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   260
  $ 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
   261
  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
   262
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   263
  $ hg topics
3060
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3027
diff changeset
   264
     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
   265
2721
c3a29c7abbee tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2720
diff changeset
   266
Note that ``default`` (name of the branch) now refers to the tipmost
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   267
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
   268
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
  $ 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
   270
  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
   271
  |  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
   272
  |  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
   273
  |  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
   274
  |  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
   275
  |  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
   276
  |
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
  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
   278
  |  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
   279
  |  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
   280
  |  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
   281
  |  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
   282
  |
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
  @  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
   284
     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
   285
     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
   286
     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
   287
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   288
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   289
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   290
  $ 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
   291
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   292
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   293
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   294
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   295
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   296
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   297
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   298
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   299
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   300
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   301
      		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
   302
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   303
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   304
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   305
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   306
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   307
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   308
      	1	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   309
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   310
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   311
      		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
   312
      		label=1,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   313
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   314
      		pos="1,1!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   315
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   316
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   317
      		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
   318
      	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
   319
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   320
      	2	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   321
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   322
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   323
      		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
   324
      		label=2,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   325
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   326
      		pos="1,2!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   327
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   328
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   329
      		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
   330
      	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
   331
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   332
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   333
#endif
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   334
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
   335
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   336
  $ 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
   337
  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
   338
  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
   339
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   340
  $ hg topics
3060
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3027
diff changeset
   341
   * 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
   342
2722
44a6e6fbf80b tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2721
diff changeset
   343
Updating to any changeset that is part of a topic activates the topic
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   344
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
   345
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   346
  $ 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
   347
  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
   348
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   349
  $ 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
   350
  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
   351
  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
   352
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   353
  $ hg topics
3060
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3027
diff changeset
   354
   * 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
   355
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   356
.. 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
   357
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
  $ 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
   359
  $ 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
   360
  > 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
   361
  > 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
   362
  > 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
   363
  > 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
   364
  > 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
   365
  > 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
   366
  > 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
   367
  > 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
   368
  > 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
   369
  > EOF
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   370
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
   371
  $ hg commit -A -m "Adding clothes"
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   372
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
   373
  $ 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
   374
2722
44a6e6fbf80b tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2721
diff changeset
   375
The topic will also affect the rebase and the merge destinations. Let's pull
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   376
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
   377
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
  $ hg pull
2120
e38156312410 tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 2045
diff changeset
   379
  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
   380
  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
   381
  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
   382
  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
   383
  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
   384
  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
   385
  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
   386
  (run 'hg heads' to see heads)
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   387
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
   388
  $ 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
   389
  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
   390
  |  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
   391
  |  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
   392
  |  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
   393
  |  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
   394
  |  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
   395
  |
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
  | 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
   397
  | |  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
   398
  | |  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
   399
  | |  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
   400
  | |  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
   401
  | |
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
  | @  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
   403
  |/   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
   404
  |    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
   405
  |    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
   406
  |    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
   407
  |
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
  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
   409
     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
   410
     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
   411
     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
   412
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   413
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   414
  $ 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
   415
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   416
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   417
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   418
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   419
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   420
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   421
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   422
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   423
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   424
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   425
      		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
   426
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   427
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   428
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   429
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   430
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   431
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   432
      	1	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   433
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   434
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   435
      		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
   436
      		label=1,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   437
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   438
      		pos="1,1!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   439
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   440
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   441
      		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
   442
      	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
   443
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   444
      	3	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   445
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   446
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   447
      		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
   448
      		label=3,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   449
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   450
      		pos="1,3!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   451
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   452
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   453
      		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
   454
      	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
   455
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   456
      	2	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   457
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   458
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   459
      		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
   460
      		label=2,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   461
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   462
      		pos="1,2!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   463
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   464
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   465
      		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
   466
      	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
   467
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   468
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   469
#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
   470
2722
44a6e6fbf80b tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2721
diff changeset
   471
The topic head will not be considered when merging from the new head of the
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   472
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
   473
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   474
  $ 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
   475
  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
   476
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
   477
  $ 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
   478
  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
   479
  (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
   480
  [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
   481
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   482
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
   483
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   484
  $ 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
   485
  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
   486
  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
   487
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
   488
  $ hg rebase
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
   489
  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
   490
  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
   491
  switching to topic food
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
   492
  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
   493
  merging shopping
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   494
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
   495
  $ 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
   496
  @  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
   497
  |  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
   498
  |  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
   499
  |  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
   500
  |  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
   501
  |  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
   502
  |
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
  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
   504
  |  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
   505
  |  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
   506
  |  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
   507
  |  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
   508
  |
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
  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
   510
  |  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
   511
  |  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
   512
  |  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
   513
  |  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
   514
  |
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
  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
   516
     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
   517
     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
   518
     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
   519
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   520
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   521
  $ 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
   522
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   523
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   524
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   525
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   526
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   527
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   528
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   529
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   530
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   531
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   532
      		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
   533
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   534
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   535
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   536
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   537
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   538
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   539
      	3	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   540
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   541
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   542
      		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
   543
      		label=3,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   544
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   545
      		pos="1,3!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   546
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   547
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   548
      		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
   549
      	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
   550
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   551
      	4	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   552
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   553
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   554
      		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
   555
      		label=4,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   556
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   557
      		pos="1,4!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   558
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   559
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   560
      		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
   561
      	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
   562
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   563
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   564
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   565
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   566
      		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
   567
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   568
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   569
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   570
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   571
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   572
      		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
   573
      	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
   574
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   575
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   576
#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
   577
3384
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   578
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
   579
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   580
  $ 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
   581
  @  5:2d50db8b5b4c food
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   582
  |   adding fruits
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   583
  o  4:4011b46eeb33 food
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   584
  |   adding condiments
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   585
  o  3:6104862e8b84
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   586
  |   Adding clothes
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   587
  o  0:38da43f0a2ea
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   588
      Shopping list
2b06f144b6e0 topics: add a new templatekeyword `topic`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3377
diff changeset
   589
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   590
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
   591
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   592
  $ hg topics
3060
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3027
diff changeset
   593
   * food (2 changesets)
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   594
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
   595
  $ hg push
2120
e38156312410 tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 2045
diff changeset
   596
  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
   597
  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
   598
  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
   599
  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
   600
  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
   601
  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
   602
  2 new obsolescence markers
2986
4746b92cc1f8 topics/ui: signal when an operation entails voiding a topic
Aurélien Campéas
parents: 2985
diff changeset
   603
  active topic 'food' is now empty
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   604
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   605
  $ hg topics
3060
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3027
diff changeset
   606
   * food (0 changesets)
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   607
2967
c62b3776fec3 topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents: 2966
diff changeset
   608
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
   609
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
   610
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   611
  $ hg topics --list
2967
c62b3776fec3 topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents: 2966
diff changeset
   612
  ### 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
   613
  ### target: default (branch)
2967
c62b3776fec3 topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents: 2966
diff changeset
   614
  (stack is empty)
3085
3eca2cbdc498 stack: order the adjective of changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3084
diff changeset
   615
  t0^ adding fruits (base current)
2967
c62b3776fec3 topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents: 2966
diff changeset
   616
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
   617
  $ 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
   618
  @  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
   619
  |  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
   620
  |  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
   621
  |  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
   622
  |  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
   623
  |
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
  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
   625
  |  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
   626
  |  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
   627
  |  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
   628
  |
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
  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
   630
  |  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
   631
  |  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
   632
  |  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
   633
  |  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
   634
  |
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
  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
   636
     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
   637
     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
   638
     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
   639
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   640
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   641
  $ 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
   642
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   643
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   644
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   645
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   646
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   647
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   648
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   649
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   650
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   651
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   652
      		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
   653
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   654
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   655
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   656
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   657
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   658
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   659
      	3	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   660
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   661
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   662
      		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
   663
      		label=3,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   664
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   665
      		pos="1,3!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   666
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   667
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   668
      		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
   669
      	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
   670
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   671
      	4	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   672
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   673
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   674
      		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
   675
      		label=4,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   676
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   677
      		pos="1,4!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   678
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   679
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   680
      		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
   681
      	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
   682
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   683
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   684
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   685
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   686
      		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
   687
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   688
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   689
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   690
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   691
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   692
      		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
   693
      	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
   694
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   695
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   696
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   697
2967
c62b3776fec3 topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents: 2966
diff changeset
   698
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
   699
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
   700
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   701
  $ 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
   702
  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
   703
  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
   704
2984
30f6030dca8f topics: signal to the end user when a topic has been forgotten
Aurélien Campéas
parents: 2979
diff changeset
   705
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
   706
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   707
  $ hg topics
2967
c62b3776fec3 topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents: 2966
diff changeset
   708
c62b3776fec3 topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas
parents: 2966
diff changeset
   709
2968
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   710
Keep working within topics
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   711
==========================
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   712
3377
4f75e0a5d82d Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 3359
diff changeset
   713
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
   714
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
   715
configuration.
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   716
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   717
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
   718
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   719
  $ cat << EOF >> .hg/hgrc
2972
33efe3a1be37 test: fix the enforce-topic configuration
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2971
diff changeset
   720
  > [experimental]
3021
5f4c42d4f2e8 test: update tests to use topic-mode enforce
Boris Feld <boris.feld@octobus.net>
parents: 3016
diff changeset
   721
  > topic-mode = enforce
2968
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   722
  > EOF
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   723
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   724
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
   725
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   726
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   727
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
   728
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   729
  $ echo sickle >> shopping
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   730
  $ hg commit -m 'Adding sickle'
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   731
  abort: no active topic
3027
b220e2f5ebd5 topic: update the topic-mode hint
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3021
diff changeset
   732
  (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
   733
  [255]
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   734
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   735
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
   736
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   737
  $ hg revert .
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   738
  reverting shopping
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   739
946b1baa8c38 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas
parents: 2967
diff changeset
   740
2014
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   741
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
   742
============================
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   743
3377
4f75e0a5d82d Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 3359
diff changeset
   744
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
   745
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
   746
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
   747
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   748
We might go shopping in a hardware store in the same go, so let's add some
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   749
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
   750
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   751
  $ 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
   752
  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
   753
  $ echo hammer >> shopping
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   754
  $ 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
   755
  active topic 'tools' grew its first changeset
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   756
2014
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   757
  $ echo saw >> shopping
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   758
  $ hg commit -m 'Adding saw'
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 drill >> shopping
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   761
  $ 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
   762
2722
44a6e6fbf80b tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2721
diff changeset
   763
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
   764
meantime, we want to extend the list with drinks. We go back to the official
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   765
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
   766
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   767
  $ 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
   768
  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
   769
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   770
  $ 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
   771
  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
   772
  $ echo 'apple juice' >> shopping
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   773
  $ 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
   774
  active topic 'drinks' grew its first changeset
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   775
2014
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   776
  $ echo 'orange juice' >> shopping
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   777
  $ 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
   778
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   779
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
   780
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
   781
  $ hg topics
3060
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3027
diff changeset
   782
   * drinks (2 changesets)
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3027
diff changeset
   783
     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
   784
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   785
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
   786
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   787
  $ 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
   788
  ### 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
   789
  ### target: default (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
   790
  t2@ Adding orange juice (current)
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   791
  t1: Adding apple juice
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2679
diff changeset
   792
  t0^ adding fruits (base)
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   793
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   794
  $ 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
   795
  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
   796
  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
   797
2014
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   798
  $ 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
   799
  ### 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
   800
  ### target: default (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
   801
  t3@ Adding drill (current)
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   802
  t2: Adding saw
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   803
  t1: Adding hammer
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2679
diff changeset
   804
  t0^ 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
   805
2722
44a6e6fbf80b tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2721
diff changeset
   806
They are seen as independent branches by Mercurial. No rebase or merge
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   807
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
   808
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   809
  $ 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
   810
  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
   811
  [1]
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   812
2970
19e20e86a514 topics/tuto: slightly more verbose explanation of what we are seeing
Aurélien Campéas
parents: 2969
diff changeset
   813
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
   814
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
   815
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   816
  $ cd ../server
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   817
  $ 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
   818
  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
   819
  $ 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
   820
  $ 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
   821
  $ cat foo >> shopping
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   822
  $ 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
   823
  $ 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
   824
  $ 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
   825
  $ 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
   826
  $ rm foo
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   827
  $ 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
   828
  $ 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
   829
2970
19e20e86a514 topics/tuto: slightly more verbose explanation of what we are seeing
Aurélien Campéas
parents: 2969
diff changeset
   830
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
   831
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
   832
  $ hg pull
2120
e38156312410 tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 2045
diff changeset
   833
  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
   834
  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
   835
  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
   836
  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
   837
  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
   838
  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
   839
  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
   840
  (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
   841
2722
44a6e6fbf80b tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2721
diff changeset
   842
There are new changes! We can simply use ``hg rebase`` to update our
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
   843
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
   844
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   845
  $ hg log -G
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   846
  o  changeset:   12:fbff9bc37a43
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   847
  |  tag:         tip
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   848
  |  user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   849
  |  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
   850
  |  summary:     add a pair of shoes
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   851
  |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   852
  o  changeset:   11:f2d6cacc6115
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   853
  |  parent:      5:2d50db8b5b4c
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   854
  |  user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   855
  |  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
   856
  |  summary:     add a coat
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   857
  |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   858
  | o  changeset:   10:70dfa201ed73
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   859
  | |  topic:       drinks
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   860
  | |  user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   861
  | |  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
   862
  | |  summary:     Adding orange juice
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   863
  | |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   864
  | o  changeset:   9:8dfa45bd5e0c
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   865
  |/   topic:       drinks
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   866
  |    parent:      5:2d50db8b5b4c
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   867
  |    user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   868
  |    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
   869
  |    summary:     Adding apple juice
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   870
  |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   871
  | @  changeset:   8:34255b455dac
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   872
  | |  topic:       tools
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   873
  | |  user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   874
  | |  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
   875
  | |  summary:     Adding drill
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   876
  | |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   877
  | o  changeset:   7:cffff85af537
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   878
  | |  topic:       tools
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   879
  | |  user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   880
  | |  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
   881
  | |  summary:     Adding saw
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   882
  | |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   883
  | o  changeset:   6:183984ef46d1
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   884
  |/   topic:       tools
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   885
  |    user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   886
  |    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
   887
  |    summary:     Adding hammer
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   888
  |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   889
  o  changeset:   5:2d50db8b5b4c
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   890
  |  user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   891
  |  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
   892
  |  summary:     adding fruits
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   893
  |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   894
  o  changeset:   4:4011b46eeb33
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   895
  |  user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   896
  |  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
   897
  |  summary:     adding condiments
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   898
  |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   899
  o  changeset:   3:6104862e8b84
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   900
  |  parent:      0:38da43f0a2ea
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   901
  |  user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   902
  |  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
   903
  |  summary:     Adding clothes
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   904
  |
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   905
  o  changeset:   0:38da43f0a2ea
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   906
     user:        test
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   907
     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
   908
     summary:     Shopping list
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
   909
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   910
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   911
  $ 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
   912
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   913
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   914
      strict digraph "Mercurial graph" {
3434
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   915
      	graph [rankdir=LR,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   916
      		splines=polyline
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   917
      	];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   918
      	node [label="\N"];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   919
      	0	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   920
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   921
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   922
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   923
      		label=0,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   924
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   925
      		pos="1,0!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   926
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   927
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   928
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   929
      	3	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   930
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   931
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   932
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   933
      		label=3,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   934
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   935
      		pos="1,3!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   936
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   937
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   938
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   939
      	0 -> 3	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   940
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   941
      	4	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   942
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   943
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   944
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   945
      		label=4,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   946
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   947
      		pos="1,4!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   948
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   949
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   950
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   951
      	3 -> 4	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   952
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   953
      	5	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   954
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   955
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   956
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   957
      		label=5,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   958
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   959
      		pos="1,5!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   960
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   961
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   962
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   963
      	4 -> 5	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   964
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   965
      	6	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   966
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   967
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   968
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   969
      		label=6,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   970
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   971
      		pos="1,6!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   972
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   973
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   974
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   975
      	5 -> 6	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   976
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   977
      	9	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   978
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   979
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   980
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   981
      		label=9,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   982
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   983
      		pos="1,9!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   984
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   985
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   986
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   987
      	5 -> 9	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   988
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   989
      	11	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   990
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   991
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   992
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   993
      		label=11,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   994
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   995
      		pos="1,11!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   996
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   997
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   998
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
   999
      	5 -> 11	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1000
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1001
      	7	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1002
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1003
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1004
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1005
      		label=7,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1006
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1007
      		pos="1,7!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1008
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1009
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1010
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1011
      	6 -> 7	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1012
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1013
      	8	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1014
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1015
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1016
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1017
      		label=8,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1018
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1019
      		pos="1,8!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1020
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1021
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1022
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1023
      	7 -> 8	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1024
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1025
      	10	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1026
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1027
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1028
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1029
      		label=10,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1030
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1031
      		pos="1,10!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1032
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1033
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1034
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1035
      	9 -> 10	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1036
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1037
      	12	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1038
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1039
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1040
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1041
      		label=12,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1042
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1043
      		pos="1,12!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1044
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1045
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1046
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1047
      	11 -> 12	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1048
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1049
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1050
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1051
2014
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1052
  $ hg rebase
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
  1053
  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
  1054
  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
  1055
  switching to topic tools
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
  1056
  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
  1057
  merging shopping
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
  1058
  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
  1059
  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
  1060
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
  1061
But what about the other topic? You can use 'hg topics --verbose' to see
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
  1062
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
  1063
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
  1064
  $ 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
  1065
     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
  1066
   * 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
  1067
2886
00518926094f topic: reword and simplify explanation of "behind"
Aurélien Campéas
parents: 2885
diff changeset
  1068
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
  1069
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
  1070
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
  1071
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1072
  $ hg push --rev drinks
2120
e38156312410 tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 2045
diff changeset
  1073
  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
  1074
  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
  1075
  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
  1076
  (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
  1077
  [255]
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1078
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1079
2971
222ad649380b topics/tuto: clarification on the scope of the tutorial
Aurélien Campéas
parents: 2970
diff changeset
  1080
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
  1081
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
  1082
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
  1083
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1084
  $ hg rebase -b drinks
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
  1085
  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
  1086
  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
  1087
  switching to topic drinks
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
  1088
  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
  1089
  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
  1090
  switching to topic tools
2827
498409c72dd2 doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2826
diff changeset
  1091
2014
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1092
  $ hg push
2120
e38156312410 tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 2045
diff changeset
  1093
  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
  1094
  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
  1095
  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
  1096
  (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
  1097
  [255]
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1098
2721
c3a29c7abbee tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2720
diff changeset
  1099
Publishing only one of them is allowed (as long as it does not create a new
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
  1100
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
  1101
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1102
  $ hg push -r drinks
2120
e38156312410 tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 2045
diff changeset
  1103
  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
  1104
  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
  1105
  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
  1106
  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
  1107
  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
  1108
  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
  1109
  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
  1110
2722
44a6e6fbf80b tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents: 2721
diff changeset
  1111
The published topic has now disappeared, and the other is now marked as
2825
7608f1e04205 doc: fix test2rst
Boris Feld <boris.feld@octobus.net>
parents: 2823
diff changeset
  1112
"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
  1113
2969
3d39b8867b29 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas
parents: 2968
diff changeset
  1114
  $ 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
  1115
   * 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
  1116
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
  $ 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
  1118
  ### 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
  1119
  ### target: default (branch), 2 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
  1120
  t3@ Adding drill (current)
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1121
  t2: Adding saw
cd6d32a0155c tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2013
diff changeset
  1122
  t1: Adding hammer
2712
f19b314d8475 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2679
diff changeset
  1123
  t0^ 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
  1124
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1125
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
  1126
===========================
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1127
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1128
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
  1129
----------------------------
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1130
2885
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
  1131
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
  1132
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1133
  $ hg topics --verbose
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1134
   * 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
  1135
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1136
  $ hg stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1137
  ### 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
  1138
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1139
  t3@ Adding drill (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1140
  t2: Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1141
  t1: Adding hammer
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1142
  t0^ add a pair of shoes (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1143
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1144
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
  1145
2973
0192d6bc25fa topics/tuto: try to be more clear when explaining previous/next
Aurélien Campéas
parents: 2972
diff changeset
  1146
`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
  1147
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1148
  $ hg previous
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1149
  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
  1150
  [14] Adding saw
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 stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1153
  ### 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
  1154
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1155
  t3: Adding drill
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1156
  t2@ Adding saw (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1157
  t1: Adding hammer
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1158
  t0^ add a pair of shoes (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1159
2973
0192d6bc25fa topics/tuto: try to be more clear when explaining previous/next
Aurélien Campéas
parents: 2972
diff changeset
  1160
`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
  1161
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1162
  $ hg next
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1163
  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
  1164
  [15] Adding drill
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 stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1167
  ### 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
  1168
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1169
  t3@ Adding drill (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1170
  t2: Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1171
  t1: Adding hammer
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1172
  t0^ add a pair of shoes (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1173
2974
af37cdaa84ee topics/tuto: attempt to have a slightly more clear wording
Aurélien Campéas
parents: 2973
diff changeset
  1174
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
  1175
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1176
  $ hg update t1
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1177
  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
  1178
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1179
  $ hg stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1180
  ### 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
  1181
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1182
  t3: Adding drill
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1183
  t2: Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1184
  t1@ Adding hammer (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1185
  t0^ add a pair of shoes (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1186
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1187
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
  1188
---------------------------
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1189
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1190
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
  1191
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1192
  $ hg stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1193
  ### 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
  1194
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1195
  t3: Adding drill
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1196
  t2: Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1197
  t1@ Adding hammer (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1198
  t0^ add a pair of shoes (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1199
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1200
  $ 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
  1201
  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
  1202
2975
7964b9138549 topics/tuto: try to be more precise on why `hg log` output is hairy
Aurélien Campéas
parents: 2974
diff changeset
  1203
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
  1204
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
  1205
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1206
  $ hg log -G -r "t0::"
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1207
  @  changeset:   18:b7509bd417f8
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1208
  |  tag:         tip
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1209
  |  topic:       tools
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1210
  |  parent:      12:fbff9bc37a43
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1211
  |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1212
  |  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
  1213
  |  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
  1214
  |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1215
  | 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
  1216
  | |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1217
  | |  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
  1218
  | |  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
  1219
  | |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1220
  | 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
  1221
  |/   parent:      12:fbff9bc37a43
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1222
  |    user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1223
  |    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
  1224
  |    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
  1225
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
  1226
  | *  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
  1227
  | |  topic:       tools
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1228
  | |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1229
  | |  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
  1230
  | |  instability: orphan
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1231
  | |  summary:     Adding drill
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1232
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
  1233
  | *  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
  1234
  | |  topic:       tools
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1235
  | |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1236
  | |  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
  1237
  | |  instability: orphan
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1238
  | |  summary:     Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1239
  | |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1240
  | 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
  1241
  |/   topic:       tools
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1242
  |    user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1243
  |    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
  1244
  |    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
  1245
  |    summary:     Adding hammer
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1246
  |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1247
  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
  1248
  |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1249
  ~  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
  1250
     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
  1251
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1252
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1253
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1254
  $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1255
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1256
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
  1257
      strict digraph "Mercurial graph" {
3434
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1258
      	graph [rankdir=LR,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1259
      		splines=polyline
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1260
      	];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1261
      	node [label="\N"];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1262
      	12	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1263
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1264
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1265
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1266
      		label=12,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1267
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1268
      		pos="1,12!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1269
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1270
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1271
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1272
      	13	 [fillcolor="#DFDFFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1273
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1274
      		group=default_alt,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1275
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1276
      		label=13,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1277
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1278
      		pos="2,13!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1279
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1280
      		style="dotted, filled",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1281
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1282
      	12 -> 13	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1283
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1284
      	18	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1285
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1286
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1287
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1288
      		label=18,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1289
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1290
      		pos="1,18!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1291
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1292
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1293
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1294
      	12 -> 18	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1295
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1296
      	16	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1297
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1298
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1299
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1300
      		label=16,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1301
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1302
      		pos="1,16!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1303
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1304
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1305
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1306
      	12 -> 16	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1307
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1308
      	13 -> 18	 [arrowtail=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1309
      		dir=back,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1310
      		minlen=0,
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
      		style=dashed];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1313
      	14	 [fillcolor="#FF4F4F",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1314
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1315
      		group=default_alt,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1316
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1317
      		label=14,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1318
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1319
      		pos="2,14!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1320
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1321
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1322
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1323
      	13 -> 14	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1324
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1325
      	15	 [fillcolor="#FF4F4F",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1326
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1327
      		group=default_alt,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1328
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1329
      		label=15,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1330
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1331
      		pos="2,15!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1332
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1333
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1334
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1335
      	14 -> 15	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1336
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1337
      	17	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1338
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1339
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1340
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1341
      		label=17,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1342
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1343
      		pos="1,17!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1344
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1345
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1346
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1347
      	16 -> 17	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1348
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1349
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1350
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1351
2885
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
  1352
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
  1353
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1354
  $ hg stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1355
  ### 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
  1356
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1357
  t3$ Adding drill (unstable)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1358
  t2$ Adding saw (unstable)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1359
  t1@ Adding hammer to the shopping list (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1360
  t0^ add a pair of shoes (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1361
2976
e5edfb5aba0c topics/tuto: be more complete over the de-orphaning action within a topic
Aurélien Campéas
parents: 2975
diff changeset
  1362
It's easy to stabilize the situation, `next` has an `--evolve` option.  It will
e5edfb5aba0c topics/tuto: be more complete over the de-orphaning action within a topic
Aurélien Campéas
parents: 2975
diff changeset
  1363
do the necessary relocation of `t2` and `t3` over the new `t1` without having
e5edfb5aba0c topics/tuto: be more complete over the de-orphaning action within a topic
Aurélien Campéas
parents: 2975
diff changeset
  1364
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
  1365
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1366
  $ hg next --evolve
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1367
  move:[14] Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1368
  atop:[18] 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
  1369
  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
  1370
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1371
  $ hg stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1372
  ### 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
  1373
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1374
  t3$ Adding drill (unstable)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1375
  t2@ Adding saw (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1376
  t1: 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
  1377
  t0^ add a pair of shoes (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1378
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1379
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
  1380
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1381
  $ hg next --evolve
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1382
  move:[15] Adding drill
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1383
  atop:[19] Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1384
  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
  1385
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1386
  $ hg stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1387
  ### 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
  1388
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1389
  t3@ Adding drill (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1390
  t2: Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1391
  t1: 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
  1392
  t0^ add a pair of shoes (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1393
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1394
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
  1395
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1396
  $ hg log -G -r "t0::"
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1397
  @  changeset:   20:bae3758e46bf
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1398
  |  tag:         tip
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1399
  |  topic:       tools
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1400
  |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1401
  |  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
  1402
  |  summary:     Adding drill
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1403
  |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1404
  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
  1405
  |  topic:       tools
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1406
  |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1407
  |  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
  1408
  |  summary:     Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1409
  |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1410
  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
  1411
  |  topic:       tools
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1412
  |  parent:      12:fbff9bc37a43
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1413
  |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1414
  |  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
  1415
  |  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
  1416
  |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1417
  | 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
  1418
  | |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1419
  | |  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
  1420
  | |  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
  1421
  | |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1422
  | 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
  1423
  |/   parent:      12:fbff9bc37a43
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1424
  |    user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1425
  |    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
  1426
  |    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
  1427
  |
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1428
  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
  1429
  |  user:        test
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1430
  ~  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
  1431
     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
  1432
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1433
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1434
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1435
  $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1436
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1437
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
  1438
      strict digraph "Mercurial graph" {
3434
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1439
      	graph [rankdir=LR,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1440
      		splines=polyline
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1441
      	];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1442
      	node [label="\N"];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1443
      	12	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1444
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1445
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1446
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1447
      		label=12,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1448
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1449
      		pos="1,12!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1450
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1451
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1452
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1453
      	16	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1454
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1455
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1456
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1457
      		label=16,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1458
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1459
      		pos="1,16!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1460
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1461
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1462
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1463
      	12 -> 16	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1464
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1465
      	18	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1466
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1467
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1468
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1469
      		label=18,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1470
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1471
      		pos="1,18!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1472
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1473
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1474
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1475
      	12 -> 18	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1476
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1477
      	17	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1478
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1479
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1480
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1481
      		label=17,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1482
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1483
      		pos="1,17!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1484
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1485
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1486
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1487
      	16 -> 17	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1488
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1489
      	19	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1490
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1491
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1492
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1493
      		label=19,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1494
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1495
      		pos="1,19!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1496
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1497
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1498
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1499
      	18 -> 19	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1500
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1501
      	20	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1502
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1503
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1504
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1505
      		label=20,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1506
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1507
      		pos="1,20!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1508
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1509
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1510
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1511
      	19 -> 20	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1512
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1513
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1514
#endif
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1515
Multi-headed stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1516
------------------
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1517
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1518
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
  1519
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1520
  $ hg up t1
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1521
  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
  1522
2830
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1523
  $ 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
  1524
  $ 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
  1525
  $ 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
  1526
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1527
  $ 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
  1528
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1529
  $ hg stack
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1530
  ### 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
  1531
  ### target: default (branch), 2 behind
2829
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1532
  t4: Adding drill
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1533
  t3: Adding saw
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1534
  t1^ Adding hammer to the shopping list (base)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1535
  t2@ Adding nails (current)
1c529afd3fef doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2827
diff changeset
  1536
  t1: 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
  1537
  t0^ 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
  1538
2885
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
  1539
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
  1540
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
  1541
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
  1542
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
  1543
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1544
  $ 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
  1545
  @  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
  1546
  |  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
  1547
  |  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
  1548
  |  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
  1549
  |  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
  1550
  |  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
  1551
  |  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
  1552
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1553
  | 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
  1554
  | |  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
  1555
  | |  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
  1556
  | |  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
  1557
  | |  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
  1558
  | |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1559
  | 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
  1560
  |/   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
  1561
  |    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
  1562
  |    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
  1563
  |    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
  1564
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1565
  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
  1566
  |  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
  1567
  |  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
  1568
  |  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
  1569
  |  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
  1570
  |  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
  1571
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1572
  | 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
  1573
  | |  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
  1574
  | |  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
  1575
  | |  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
  1576
  | |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1577
  | 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
  1578
  |/   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
  1579
  |    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
  1580
  |    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
  1581
  |    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
  1582
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1583
  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
  1584
  |  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
  1585
  |  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
  1586
  |  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
  1587
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1588
  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
  1589
  |  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
  1590
  |  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
  1591
  |  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
  1592
  |  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
  1593
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1594
  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
  1595
  |  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
  1596
  |  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
  1597
  |  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
  1598
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1599
  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
  1600
  |  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
  1601
  |  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
  1602
  |  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
  1603
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1604
  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
  1605
  |  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
  1606
  |  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
  1607
  |  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
  1608
  |  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
  1609
  |
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1610
  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
  1611
     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
  1612
     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
  1613
     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
  1614
  
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1615
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1616
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1617
  $ 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
  1618
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1619
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
  1620
      strict digraph "Mercurial graph" {
3434
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1621
      	graph [rankdir=LR,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1622
      		splines=polyline
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1623
      	];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1624
      	node [label="\N"];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1625
      	0	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1626
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1627
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1628
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1629
      		label=0,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1630
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1631
      		pos="1,0!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1632
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1633
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1634
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1635
      	3	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1636
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1637
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1638
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1639
      		label=3,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1640
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1641
      		pos="1,3!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1642
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1643
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1644
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1645
      	0 -> 3	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1646
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1647
      	4	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1648
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1649
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1650
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1651
      		label=4,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1652
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1653
      		pos="1,4!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1654
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1655
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1656
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1657
      	3 -> 4	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1658
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1659
      	5	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1660
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1661
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1662
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1663
      		label=5,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1664
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1665
      		pos="1,5!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1666
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1667
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1668
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1669
      	4 -> 5	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1670
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1671
      	11	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1672
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1673
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1674
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1675
      		label=11,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1676
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1677
      		pos="1,11!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1678
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1679
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1680
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1681
      	5 -> 11	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1682
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1683
      	12	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1684
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1685
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1686
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1687
      		label=12,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1688
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1689
      		pos="1,12!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1690
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1691
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1692
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1693
      	11 -> 12	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1694
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1695
      	16	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1696
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1697
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1698
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1699
      		label=16,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1700
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1701
      		pos="1,16!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1702
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1703
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1704
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1705
      	12 -> 16	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1706
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1707
      	18	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1708
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1709
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1710
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1711
      		label=18,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1712
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1713
      		pos="1,18!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1714
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1715
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1716
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1717
      	12 -> 18	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1718
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1719
      	17	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1720
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1721
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1722
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1723
      		label=17,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1724
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1725
      		pos="1,17!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1726
      		shape=circle,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1727
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1728
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1729
      	16 -> 17	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1730
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1731
      	19	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1732
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1733
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1734
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1735
      		label=19,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1736
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1737
      		pos="1,19!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1738
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1739
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1740
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1741
      	18 -> 19	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1742
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1743
      	21	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1744
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1745
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1746
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1747
      		label=21,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1748
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1749
      		pos="1,21!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1750
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1751
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1752
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1753
      	18 -> 21	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1754
      		penwidth=2.0];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1755
      	20	 [fillcolor="#7F7FFF",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1756
      		fixedsize=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1757
      		group=default,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1758
      		height=1,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1759
      		label=20,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1760
      		pin=true,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1761
      		pos="1,20!",
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1762
      		shape=pentagon,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1763
      		style=filled,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1764
      		width=1];
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1765
      	19 -> 20	 [arrowhead=none,
100bfaafbd3b tutorial: docgraph output seems to have been dedented
Boris Feld <boris.feld@octobus.net>
parents: 3411
diff changeset
  1766
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1767
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1768
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1769
2830
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1770
  $ hg up t4
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1771
  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
  1772
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1773
  $ hg rebase
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
  1774
  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
  1775
  merging shopping
3016
d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
  1776
  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
  1777
  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
  1778
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1779
  $ 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
  1780
  ### 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
  1781
  ### target: default (branch), 2 behind
2830
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1782
  t4@ Adding drill (current)
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1783
  t3: 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
  1784
  t2: 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
  1785
  t1: 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
  1786
  t0^ add a pair of shoes (base)
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1787
2885
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
  1788
Collaborating through a non-publishing server
2966
d1d47e025dd3 topics/tuto: fix title underline type introduced earlier
Aurélien Campéas
parents: 2965
diff changeset
  1789
=============================================
2830
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1790
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1791
.. setup:
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1792
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1793
.. 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
  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
  $ cd ..
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
  $ 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
  1798
  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
  1799
  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
  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
  $ 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
  1802
  $ 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
  1803
  > [phases]
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1804
  > 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
  1805
  > EOF
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1806
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1807
.. 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
  1808
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1809
  $ cd ..
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
  $ 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
  1812
  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
  1813
  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
  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
  $ 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
  1816
2885
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
  1817
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
  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
  $ 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
  1820
  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
  1821
  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
  1822
  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
  1823
  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
  1824
  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
  1825
  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
  1826
  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
  1827
3377
4f75e0a5d82d Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 3359
diff changeset
  1828
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
  1829
--force. As long as new heads are on their own topic, Mercurial will not
2885
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
  1830
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
  1831
2885
e61a9fde2125 topic: tutorial grammar fixes
Aurélien Campéas
parents: 2854
diff changeset
  1832
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
  1833
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1834
  $ 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
  1835
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1836
  $ 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
  1837
  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
  1838
  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
  1839
  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
  1840
  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
  1841
  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
  1842
  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
  1843
  8 new obsolescence markers
3075
8feb2cae7eae test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3060
diff changeset
  1844
  new changesets b7509bd417f8:2d084ac00115
2830
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1845
  (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
  1846
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1847
  $ 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
  1848
     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
  1849
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1850
  $ 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
  1851
  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
  1852
  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
  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 stack
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1855
  ### 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
  1856
  ### target: default (branch), 2 behind
2830
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1857
  t4@ Adding drill (current)
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1858
  t3: 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
  1859
  t2: 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
  1860
  t1: 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
  1861
  t0^ add a pair of shoes (base)
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1862
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1863
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
  1864
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1865
  $ 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
  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
  $ 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
  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
  $ 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
  1870
  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
  1871
  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
  1872
  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
  1873
  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
  1874
  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
  1875
  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
  1876
3377
4f75e0a5d82d Small typos fixing in the topic tutorial
Boris Feld <boris.feld@octobus.net>
parents: 3359
diff changeset
  1877
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
  1878
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1879
  $ 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
  1880
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1881
  $ 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
  1882
  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
  1883
  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
  1884
  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
  1885
  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
  1886
  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
  1887
  added 1 changesets with 1 changes to 1 files
3075
8feb2cae7eae test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3060
diff changeset
  1888
  new changesets 0d409663a1fd
2830
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1889
  (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
  1890
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1891
  $ 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
  1892
  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
  1893
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1894
  $ 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
  1895
  ### 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
  1896
  ### target: default (branch), 2 behind
2830
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1897
  t5@ Adding screws (current)
499b2dd69107 doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2829
diff changeset
  1898
  t4: 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
  1899
  t3: 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
  1900
  t2: 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
  1901
  t1: 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
  1902
  t0^ add a pair of shoes (base)