tests/test-tutorial.t
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 11 Jan 2018 20:03:20 +0530
changeset 3453 32ed5b6fadd3
parent 3431 2e703ed1c713
child 3475 a03bb02dfaba
permissions -rw-r--r--
grab: add a command to grab a commit and update to it This patch adds anew command `hg grab` which will pick a commit and put it on the top of the working directory parent and updates to it. Earlier grab was an alias for `hg rebase -r <rev> -d .` which is now deleted to make sure `hg grab` resolves to the grab command and that alias. Continuing interrupted grab functionality is also there using the evolvestate class. Tests are also added for the new introduced command.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     1
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     2
Initial setup
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     3
-------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     4
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     5
This Mercurial configuration example is used for testing.
2826
93588d219f2f doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents: 2822
diff changeset
     6
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     7
.. Various setup
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     8
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     9
  $ cat >> $HGRCPATH << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    10
  > [ui]
766
32936a9f4389 doc: some documentation on the configuration part of the tutorial
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 750
diff changeset
    11
  > # This is change the default output of log for clear tutorial
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    12
  > logtemplate ="{node|short} ({phase}): {desc}\n"
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    13
  > [diff]
766
32936a9f4389 doc: some documentation on the configuration part of the tutorial
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 750
diff changeset
    14
  > # use "git" diff format, clearer and smarter format
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    15
  > git = 1
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    16
  > [alias]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    17
  > # "-d '0 0'" means that the new commit will be at January 1st 1970.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    18
  > # This is used for stable hash during test
766
32936a9f4389 doc: some documentation on the configuration part of the tutorial
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 750
diff changeset
    19
  > # (this tutorial is automatically tested.)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    20
  > amend = amend -d '0 0'
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    21
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    22
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    23
  $ hg init local
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    24
  $ cat >> local/.hg/hgrc << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    25
  > [paths]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    26
  > remote = ../remote
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    27
  > other = ../other
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    28
  > [ui]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    29
  > user = Babar the King
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    30
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    31
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    32
  $ hg init remote
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    33
  $ cat >> remote/.hg/hgrc << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    34
  > [paths]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    35
  > local = ../local
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    36
  > [ui]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    37
  > user = Celestine the Queen
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    38
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    39
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    40
  $ hg init other
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    41
  $ cat >> other/.hg/hgrc << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    42
  > [ui]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    43
  > user = Princess Flore
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    44
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    45
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    46
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
    47
This tutorial uses the following configuration for Mercurial:
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    48
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    49
A compact log template with phase data:
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    50
766
32936a9f4389 doc: some documentation on the configuration part of the tutorial
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 750
diff changeset
    51
  $ hg showconfig ui | grep log
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    52
  ui.logtemplate="{node|short} ({phase}): {desc}\n"
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    53
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    54
Improved git format diff:
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    55
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    56
  $ hg showconfig diff
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    57
  diff.git=1
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    58
508
d1c658a6d0bc test-tutorial: stop using enable.sh, removed by 53d7e3413337
Patrick Mezard <patrick@mezard.eu>
parents: 492
diff changeset
    59
And of course, we enable the experimental extensions for mutable history:
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    60
508
d1c658a6d0bc test-tutorial: stop using enable.sh, removed by 53d7e3413337
Patrick Mezard <patrick@mezard.eu>
parents: 492
diff changeset
    61
  $ cat >> $HGRCPATH <<EOF
d1c658a6d0bc test-tutorial: stop using enable.sh, removed by 53d7e3413337
Patrick Mezard <patrick@mezard.eu>
parents: 492
diff changeset
    62
  > [extensions]
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1782
diff changeset
    63
  > evolve = $TESTDIR/../hgext3rd/evolve/
766
32936a9f4389 doc: some documentation on the configuration part of the tutorial
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 750
diff changeset
    64
  > # enabling rebase is also needed for now
508
d1c658a6d0bc test-tutorial: stop using enable.sh, removed by 53d7e3413337
Patrick Mezard <patrick@mezard.eu>
parents: 492
diff changeset
    65
  > rebase =
d1c658a6d0bc test-tutorial: stop using enable.sh, removed by 53d7e3413337
Patrick Mezard <patrick@mezard.eu>
parents: 492
diff changeset
    66
  > EOF
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    67
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
    68
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
    69
  $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
    70
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
    71
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    72
-----------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    73
Single Developer Usage
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    74
-----------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    75
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    76
This tutorial shows how to use evolution to rewrite history locally.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    77
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    78
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    79
Fixing mistake with `hg amend`
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    80
--------------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    81
1663
ec6334e6627a Spelling: versioning
timeless@gmail.com
parents: 1658
diff changeset
    82
We are versioning a shopping list
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    83
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    84
  $ cd local
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    85
  $ cat  >> shopping << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    86
  > Spam
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    87
  > Whizzo butter
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    88
  > Albatross
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    89
  > Rat (rather a lot)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    90
  > Jugged fish
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    91
  > Blancmange
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    92
  > Salmon mousse
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    93
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    94
  $ hg commit -A -m "Monthy Python Shopping list"
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    95
  adding shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    96
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    97
Its first version is shared with the outside.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    98
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    99
  $ hg push remote
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
   100
  pushing to $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   101
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   102
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   103
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   104
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   105
  added 1 changesets with 1 changes to 1 files
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   106
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   107
Later I add additional item to my list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   108
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   109
  $ cat >> shopping << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   110
  > Egg
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   111
  > Suggar
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   112
  > Vinegar
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   113
  > Oil
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   114
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   115
  $ hg commit -m "adding condiment"
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   116
  $ cat >> shopping << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   117
  > Bananos
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   118
  > Pear
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   119
  > Apple
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   120
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   121
  $ hg commit -m "adding fruit"
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   122
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   123
This history is very linear
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   124
634
e763f7e94211 tutorial: glog is into core now
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 590
diff changeset
   125
  $ hg log -G
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   126
  @  d85de4546133 (draft): adding fruit
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   127
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   128
  o  4d5dc8187023 (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   129
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   130
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   131
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   132
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   133
  $ 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
   134
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   135
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   136
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   137
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   138
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   139
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   140
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   141
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   142
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   143
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   144
      		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
   145
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   146
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   147
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   148
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   149
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   150
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   151
      	1	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   152
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   153
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   154
      		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
   155
      		label=1,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   156
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   157
      		pos="1,1!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   158
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   159
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   160
      		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
   161
      	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
   162
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   163
      	2	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   164
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   165
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   166
      		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
   167
      		label=2,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   168
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   169
      		pos="1,2!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   170
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   171
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   172
      		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
   173
      	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
   174
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   175
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   176
#endif
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   177
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   178
But a typo was made in Babanas!
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   179
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   180
  $ hg export tip
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   181
  # HG changeset patch
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   182
  # User test
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   183
  # Date 0 0
726
06cd220141ba Adapt to human readable date in patch
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 696
diff changeset
   184
  #      Thu Jan 01 00:00:00 1970 +0000
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   185
  # Node ID d85de4546133030c82d257bbcdd9b1b416d0c31c
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   186
  # Parent  4d5dc81870237d492284826e21840b2ca00e26d1
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   187
  adding fruit
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   188
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   189
  diff --git a/shopping b/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   190
  --- a/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   191
  +++ b/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   192
  @@ -9,3 +9,6 @@
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   193
   Suggar
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   194
   Vinegar
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   195
   Oil
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   196
  +Bananos
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   197
  +Pear
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   198
  +Apple
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   199
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
   200
The faulty changeset is in the "draft" phase because it has not been exchanged with
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
   201
the outside. The first one has been exchanged and is "public" (immutable).
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   202
634
e763f7e94211 tutorial: glog is into core now
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 590
diff changeset
   203
  $ hg log -G
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   204
  @  d85de4546133 (draft): adding fruit
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   205
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   206
  o  4d5dc8187023 (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   207
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   208
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   209
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   210
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   211
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   212
  $ 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
   213
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   214
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   215
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   216
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   217
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   218
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   219
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   220
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   221
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   222
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   223
      		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
   224
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   225
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   226
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   227
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   228
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   229
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   230
      	1	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   231
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   232
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   233
      		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
   234
      		label=1,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   235
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   236
      		pos="1,1!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   237
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   238
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   239
      		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
   240
      	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
   241
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   242
      	2	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   243
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   244
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   245
      		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
   246
      		label=2,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   247
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   248
      		pos="1,2!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   249
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   250
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   251
      		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
   252
      	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
   253
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   254
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   255
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   256
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
   257
Hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   258
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   259
  $ sed -i'' -e s/Bananos/Banana/ shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   260
  $ hg diff
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   261
  diff --git a/shopping b/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   262
  --- a/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   263
  +++ b/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   264
  @@ -9,6 +9,6 @@
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   265
   Suggar
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   266
   Vinegar
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   267
   Oil
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   268
  -Bananos
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   269
  +Banana
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   270
   Pear
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   271
   Apple
640
629ec7f612aa tutorial: second replacement of hg amend by commit --amend
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 639
diff changeset
   272
  $ hg commit --amend
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   273
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   274
A new changeset with the right diff replace the wrong one.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   275
634
e763f7e94211 tutorial: glog is into core now
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 590
diff changeset
   276
  $ hg log -G
640
629ec7f612aa tutorial: second replacement of hg amend by commit --amend
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 639
diff changeset
   277
  @  9d0363b81950 (draft): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   278
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   279
  o  4d5dc8187023 (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   280
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   281
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   282
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   283
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   284
  $ 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
   285
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   286
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   287
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   288
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   289
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   290
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   291
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   292
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   293
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   294
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   295
      		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
   296
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   297
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   298
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   299
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   300
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   301
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   302
      	1	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   303
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   304
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   305
      		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
   306
      		label=1,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   307
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   308
      		pos="1,1!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   309
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   310
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   311
      		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
   312
      	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
   313
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   314
      	3	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   315
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   316
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   317
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   318
      		label=3,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   319
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   320
      		pos="1,3!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   321
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   322
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   323
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   324
      	1 -> 3	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   325
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   326
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   327
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   328
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   329
  $ hg export tip
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   330
  # HG changeset patch
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   331
  # User test
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   332
  # Date 0 0
726
06cd220141ba Adapt to human readable date in patch
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 696
diff changeset
   333
  #      Thu Jan 01 00:00:00 1970 +0000
640
629ec7f612aa tutorial: second replacement of hg amend by commit --amend
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 639
diff changeset
   334
  # Node ID 9d0363b81950646bc6ad1ec5de8b8197ea586541
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   335
  # Parent  4d5dc81870237d492284826e21840b2ca00e26d1
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   336
  adding fruit
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   337
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   338
  diff --git a/shopping b/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   339
  --- a/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   340
  +++ b/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   341
  @@ -9,3 +9,6 @@
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   342
   Suggar
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   343
   Vinegar
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   344
   Oil
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   345
  +Banana
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   346
  +Pear
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   347
  +Apple
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   348
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
   349
Getting rid of branchy history
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   350
----------------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   351
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
   352
While I was working on my list. Someone made a change remotely.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   353
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   354
  $ cd ../remote
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   355
  $ hg up -q
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   356
  $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   357
  $ hg ci -m 'SPAM'
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   358
  $ cd ../local
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   359
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   360
I'll get this remote changeset when pulling
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   361
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   362
  $ hg pull remote
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
   363
  pulling from $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   364
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   365
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   366
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   367
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   368
  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: 3013
diff changeset
   369
  new changesets 9ca060c80d74
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 590
diff changeset
   370
  (run 'hg heads' to see heads, 'hg merge' to merge)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   371
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
   372
I now have a new head. Note that this remote head is immutable.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   373
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   374
  $ hg log -G
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   375
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   376
  |
640
629ec7f612aa tutorial: second replacement of hg amend by commit --amend
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 639
diff changeset
   377
  | @  9d0363b81950 (draft): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   378
  | |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   379
  | o  4d5dc8187023 (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   380
  |/
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   381
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   382
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   383
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   384
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   385
  $ 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
   386
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   387
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   388
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   389
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   390
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   391
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   392
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   393
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   394
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   395
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   396
      		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
   397
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   398
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   399
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   400
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   401
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   402
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   403
      	1	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   404
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   405
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   406
      		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
   407
      		label=1,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   408
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   409
      		pos="1,1!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   410
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   411
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   412
      		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
   413
      	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
   414
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   415
      	4	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   416
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   417
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   418
      		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
   419
      		label=4,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   420
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   421
      		pos="1,4!",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   422
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   423
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   424
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   425
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   426
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   427
      	3	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   428
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   429
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   430
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   431
      		label=3,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   432
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   433
      		pos="1,3!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   434
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   435
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   436
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   437
      	1 -> 3	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   438
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   439
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   440
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   441
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
   442
Instead of merging my head with the new one. I'm going to rebase my work
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   443
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   444
  $ hg diff
769
e2a463e1e7c8 tutorial: use long form of argument for the sake of clarity
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 768
diff changeset
   445
  $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
1188
0c879e986ce4 test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1130
diff changeset
   446
  rebasing 1:4d5dc8187023 "adding condiment"
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   447
  merging shopping
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   448
  rebasing 3:9d0363b81950 "adding fruit"
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   449
  merging shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   450
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   451
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   452
My local work is now rebased on the remote one.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   453
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   454
  $ hg log -G
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   455
  @  41aff6a42b75 (draft): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   456
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   457
  o  dfd3a2d7691e (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   458
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   459
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   460
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   461
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   462
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   463
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   464
  $ 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
   465
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   466
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   467
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   468
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   469
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   470
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   471
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   472
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   473
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   474
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   475
      		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
   476
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   477
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   478
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   479
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   480
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   481
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   482
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   483
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   484
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   485
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   486
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   487
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   488
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   489
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   490
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   491
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   492
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   493
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   494
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   495
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   496
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   497
      		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
   498
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   499
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   500
      		pos="1,5!",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   501
      		shape=pentagon,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   502
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   503
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   504
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   505
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   506
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   507
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   508
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   509
      		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
   510
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   511
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   512
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   513
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   514
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   515
      		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
   516
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   517
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   518
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   519
#endif
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   520
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
   521
Removing changesets
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   522
------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   523
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
   524
I add new items to my list.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   525
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   526
  $ cat >> shopping << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   527
  > car
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   528
  > bus
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   529
  > plane
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   530
  > boat
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   531
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   532
  $ hg ci -m 'transport'
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   533
  $ hg log -G
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   534
  @  1125e39fbf21 (draft): transport
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   535
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   536
  o  41aff6a42b75 (draft): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   537
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   538
  o  dfd3a2d7691e (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   539
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   540
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   541
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   542
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   543
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   544
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
   545
I have a new commit but I realize that don't want it. (Transport shop list does
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   546
not fit well in my standard shopping list)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   547
771
126e31c7658b tutorial Clarify "." explanation
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 770
diff changeset
   548
  $ hg prune . # "." is for working directory parent
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   549
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   550
  working directory now at 41aff6a42b75
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1188
diff changeset
   551
  1 changesets pruned
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   552
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   553
The silly changeset is gone.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   554
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   555
  $ hg log -G
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   556
  @  41aff6a42b75 (draft): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   557
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   558
  o  dfd3a2d7691e (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   559
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   560
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   561
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   562
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   563
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   564
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   565
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   566
  $ 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
   567
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   568
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   569
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   570
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   571
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   572
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   573
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   574
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   575
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   576
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   577
      		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
   578
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   579
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   580
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   581
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   582
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   583
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   584
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   585
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   586
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   587
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   588
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   589
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   590
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   591
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   592
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   593
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   594
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   595
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   596
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   597
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   598
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   599
      		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
   600
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   601
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   602
      		pos="1,5!",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   603
      		shape=pentagon,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   604
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   605
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   606
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   607
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   608
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   609
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   610
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   611
      		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
   612
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   613
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   614
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   615
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   616
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   617
      		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
   618
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   619
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   620
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   621
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   622
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
   623
Reordering changesets
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   624
------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   625
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   626
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   627
We create two changesets.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   628
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   629
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   630
  $ cat >> shopping << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   631
  > Shampoo
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   632
  > Toothbrush
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   633
  > ... More bathroom stuff to come
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   634
  > Towel
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   635
  > Soap
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   636
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   637
  $ hg ci -m 'bathroom stuff' -q # XXX remove the -q
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   638
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   639
  $ sed -i'' -e 's/Spam/Spam Spam Spam/g' shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   640
  $ hg ci -m 'SPAM SPAM'
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   641
  $ hg log -G
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   642
  @  fac207dec9f5 (draft): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   643
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   644
  o  10b8aeaa8cc8 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   645
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   646
  o  41aff6a42b75 (draft): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   647
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   648
  o  dfd3a2d7691e (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   649
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   650
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   651
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   652
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   653
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   654
774
03844e1fbfe6 tutorial: fix note
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 773
diff changeset
   655
.. note:: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   656
768
b116de5dc70d tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 767
diff changeset
   657
 I now want to push to remote all my changes except the bathroom one, which I'm
b116de5dc70d tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 767
diff changeset
   658
 not totally happy with yet. To be able to push "SPAM SPAM" I need a version of
b116de5dc70d tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 767
diff changeset
   659
 "SPAM SPAM" which is not a child of "bathroom stuff"
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   660
772
27b3442f08d9 tutorial: use grab instead of rebase.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 771
diff changeset
   661
You can use the 'grab' alias for that.
27b3442f08d9 tutorial: use grab instead of rebase.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 771
diff changeset
   662
27b3442f08d9 tutorial: use grab instead of rebase.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 771
diff changeset
   663
.. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>`
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   664
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   665
  $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   666
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   667
  $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
   668
  grabbing 9:fac207dec9f5 "SPAM SPAM"
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   669
  merging shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   670
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
   671
  @  57e9caedbcb8 (draft): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   672
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   673
  | o  10b8aeaa8cc8 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   674
  |/
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   675
  o  41aff6a42b75 (draft): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   676
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   677
  o  dfd3a2d7691e (draft): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   678
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   679
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   680
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   681
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   682
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   683
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   684
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   685
  $ 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
   686
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   687
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   688
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   689
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   690
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   691
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   692
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   693
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   694
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   695
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   696
      		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
   697
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   698
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   699
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   700
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   701
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   702
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   703
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   704
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   705
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   706
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   707
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   708
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   709
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   710
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   711
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   712
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   713
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   714
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   715
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   716
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   717
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   718
      		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
   719
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   720
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   721
      		pos="1,5!",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   722
      		shape=pentagon,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   723
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   724
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   725
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   726
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   727
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   728
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   729
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   730
      		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
   731
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   732
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   733
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   734
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   735
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   736
      		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
   737
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   738
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   739
      	8	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   740
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   741
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   742
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   743
      		label=8,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   744
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   745
      		pos="1,8!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   746
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   747
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   748
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   749
      	6 -> 8	 [arrowhead=none,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
   750
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   751
      	10	 [fillcolor="#7F7FFF",
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
   752
      		fixedsize=true,
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
   753
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   754
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   755
      		label=10,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
   756
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   757
      		pos="1,10!",
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
   758
      		shape=pentagon,
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
   759
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   760
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   761
      	6 -> 10	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   762
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   763
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   764
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   765
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   766
We have a new SPAM SPAM version without the bathroom stuff
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   767
634
e763f7e94211 tutorial: glog is into core now
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 590
diff changeset
   768
  $ grep Spam shopping  # enough spam
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   769
  Spam Spam Spam Spam Spam Spam Spam Spam Spam
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   770
  $ grep Toothbrush shopping # no Toothbrush
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   771
  [1]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   772
  $ hg export .
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   773
  # HG changeset patch
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   774
  # User test
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   775
  # Date 0 0
726
06cd220141ba Adapt to human readable date in patch
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 696
diff changeset
   776
  #      Thu Jan 01 00:00:00 1970 +0000
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
   777
  # Node ID 57e9caedbcb8575a01c128db9d1bcbd624ef2115
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   778
  # Parent  41aff6a42b7578ec7ec3cb2041633f1ca43cca96
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   779
  SPAM SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   780
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   781
  diff --git a/shopping b/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   782
  --- a/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   783
  +++ b/shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   784
  @@ -1,4 +1,4 @@
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   785
  -Spam Spam Spam
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   786
  +Spam Spam Spam Spam Spam Spam Spam Spam Spam
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   787
   Whizzo butter
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   788
   Albatross
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   789
   Rat (rather a lot)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   790
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   791
To make sure I do not push unready changeset by mistake I set the "bathroom
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   792
stuff" changeset in the secret phase.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   793
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   794
  $ hg phase --force --secret 10b8aeaa8cc8
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   795
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   796
we can now push our change:
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   797
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   798
  $ hg push remote
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
   799
  pushing to $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   800
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   801
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   802
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   803
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   804
  added 3 changesets with 3 changes to 1 files
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   805
  5 new obsolescence markers
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   806
768
b116de5dc70d tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 767
diff changeset
   807
for simplicity sake we get the bathroom change in line again
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   808
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   809
  $ hg grab 10b8aeaa8cc8
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
   810
  grabbing 8:10b8aeaa8cc8 "bathroom stuff"
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   811
  merging shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   812
  $ hg phase --draft .
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
   813
  no phases changed
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   814
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
   815
  @  4710c0968793 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   816
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
   817
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   818
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   819
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   820
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   821
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   822
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   823
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   824
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   825
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   826
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   827
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   828
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   829
  $ 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
   830
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   831
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   832
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   833
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   834
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   835
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   836
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   837
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   838
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   839
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   840
      		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
   841
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   842
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   843
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   844
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   845
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   846
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   847
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   848
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   849
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   850
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   851
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   852
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   853
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   854
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   855
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   856
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   857
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   858
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   859
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   860
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   861
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   862
      		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
   863
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   864
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   865
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   866
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   867
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   868
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   869
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   870
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   871
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   872
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   873
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   874
      		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
   875
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   876
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   877
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   878
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   879
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   880
      		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
   881
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   882
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   883
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   884
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   885
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   886
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   887
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   888
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   889
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   890
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   891
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   892
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   893
      	6 -> 10	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   894
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   895
      	11	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   896
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   897
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   898
      		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
   899
      		label=11,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   900
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   901
      		pos="1,11!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   902
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   903
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   904
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   905
      	10 -> 11	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
   906
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   907
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   908
#endif
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   909
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   910
Splitting change
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   911
------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   912
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   913
This part is not written yet, but you can use either the `histedit` extension
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   914
of the `uncommit` command to splitting a change.
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   915
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   916
  $ hg help uncommit
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   917
  hg uncommit [OPTION]... [NAME]
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   918
  
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   919
  move changes from parent revision to working directory
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   920
  
891
36c1c80e99a3 commands: small language fixes in help
Brendan Cully <brendan@kublai.com>
parents: 867
diff changeset
   921
      Changes to selected files in the checked out revision appear again as
36c1c80e99a3 commands: small language fixes in help
Brendan Cully <brendan@kublai.com>
parents: 867
diff changeset
   922
      uncommitted changed in the working directory. A new revision without the
36c1c80e99a3 commands: small language fixes in help
Brendan Cully <brendan@kublai.com>
parents: 867
diff changeset
   923
      selected changes is created, becomes the checked out revision, and
36c1c80e99a3 commands: small language fixes in help
Brendan Cully <brendan@kublai.com>
parents: 867
diff changeset
   924
      obsoletes the previous one.
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   925
  
867
6a67606e1c34 evolve: fix typos in uncommit docstring
André Sintzoff <andre.sintzoff@gmail.com>
parents: 803
diff changeset
   926
      The --include option specifies patterns to uncommit. The --exclude option
6a67606e1c34 evolve: fix typos in uncommit docstring
André Sintzoff <andre.sintzoff@gmail.com>
parents: 803
diff changeset
   927
      specifies patterns to keep in the commit.
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   928
  
1058
00bc31523074 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
   929
      The --rev argument let you change the commit file to a content of another
00bc31523074 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
   930
      revision. It still does not change the content of your file in the working
00bc31523074 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
   931
      directory.
00bc31523074 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
   932
  
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   933
      Return 0 if changed files are uncommitted.
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   934
  
1064
95d84c8b4bcc test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1058
diff changeset
   935
  options ([+] can be repeated):
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   936
  
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   937
   -a --all                 uncommit all changes when no arguments given
1058
00bc31523074 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
   938
   -r --rev VALUE           revert commit content to REV instead
3389
eacf6149b678 uncommit: add a new flag `--revert` to discard wdir changes after uncommit
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
   939
      --revert              discard working directory changes after uncommit
3220
f0f4cc2febac uncommit: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3219
diff changeset
   940
   -n --note VALUE          store a note on uncommit
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   941
   -I --include PATTERN [+] include names matching the given patterns
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   942
   -X --exclude PATTERN [+] exclude names matching the given patterns
2727
f7d44441dfd3 uncommit: add support for --message and --logfile
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
   943
   -m --message TEXT        use text as commit message
f7d44441dfd3 uncommit: add support for --message and --logfile
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
   944
   -l --logfile FILE        read commit message from file
2728
3c371aa16cb9 uncommit: add support for --user and --date
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2727
diff changeset
   945
   -d --date DATE           record the specified date as commit date
3c371aa16cb9 uncommit: add support for --user and --date
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2727
diff changeset
   946
   -u --user USER           record the specified user as committer
2729
69fe16428b0f uncommit: add support for -U and -D
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2728
diff changeset
   947
   -D --current-date        record the current date as commit date
69fe16428b0f uncommit: add support for -U and -D
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2728
diff changeset
   948
   -U --current-user        record the current user as committer
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   949
  
1064
95d84c8b4bcc test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1058
diff changeset
   950
  (some details hidden, use --verbose to show complete help)
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   951
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   952
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   953
The edit command of histedit can be used to split changeset:
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   954
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   955
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   956
Collapsing change
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   957
------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   958
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   959
The tutorial part is not written yet but can use `hg fold`:
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   960
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   961
  $ hg help fold
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 957
diff changeset
   962
  hg fold [OPTION]... [-r] REV
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   963
  
934
f13facb01ac5 fold: add squash as a possible alias
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 933
diff changeset
   964
  aliases: squash
f13facb01ac5 fold: add squash as a possible alias
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 933
diff changeset
   965
  
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 957
diff changeset
   966
  fold multiple revisions into a single one
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   967
  
1782
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1756
diff changeset
   968
      With --from, folds all the revisions linearly between the given revisions
1463
71a3aa0349c5 evolve: improve the help of the fold command
Laurent Charignon <lcharignon@fb.com>
parents: 1452
diff changeset
   969
      and the parent of the working directory.
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   970
  
1782
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1756
diff changeset
   971
      With --exact, folds only the specified revisions while ignoring the parent
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1756
diff changeset
   972
      of the working directory. In this case, the given revisions must form a
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1756
diff changeset
   973
      linear unbroken chain.
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   974
  
1064
95d84c8b4bcc test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1058
diff changeset
   975
  options ([+] can be repeated):
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   976
  
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 957
diff changeset
   977
   -r --rev VALUE [+] revision to fold
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 957
diff changeset
   978
      --exact         only fold specified revisions
1782
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1756
diff changeset
   979
      --from          fold revisions linearly to working copy parent
3219
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3075
diff changeset
   980
   -n --note VALUE    store a note on fold
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   981
   -m --message TEXT  use text as commit message
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   982
   -l --logfile FILE  read commit message from file
915
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 891
diff changeset
   983
   -d --date DATE     record the specified date as commit date
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 891
diff changeset
   984
   -u --user USER     record the specified user as committer
2768
85e5a56db776 fold: add support for the -D and -U options
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2729
diff changeset
   985
   -D --current-date  record the current date as commit date
85e5a56db776 fold: add support for the -D and -U options
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2729
diff changeset
   986
   -U --current-user  record the current user as committer
767
01a270481a61 tutorial Display the help of appropriate command in section that need writting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 766
diff changeset
   987
  
1064
95d84c8b4bcc test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1058
diff changeset
   988
  (some details hidden, use --verbose to show complete help)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   989
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   990
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   991
-----------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   992
Collaboration
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   993
-----------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   994
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   995
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
   996
Sharing mutable changesets
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   997
----------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   998
768
b116de5dc70d tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 767
diff changeset
   999
To share mutable changesets with others, just check that the repo you interact
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1000
with is "not publishing". Otherwise you will get the previously observe
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1001
behavior where exchanged changeset are automatically published.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1002
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1003
  $ cd ../remote
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1004
  $ hg -R ../local/ showconfig phases
1113
4b37588bee3b test: adapt to mercurial changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1111
diff changeset
  1005
  [1]
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1006
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1007
The localrepo does not have any specific configuration for `phases.publish`. It
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1008
is ``true`` by default.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1009
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1010
  $ hg pull local
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
  1011
  pulling from $TESTTMP/local (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1012
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1013
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1014
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1015
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1016
  added 1 changesets with 1 changes to 1 files
1453
8ca31deb8db7 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1452
diff changeset
  1017
  1 new obsolescence markers
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1018
  new changesets 4710c0968793
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1019
  (run 'hg update' to get a working copy)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1020
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1021
  o  4710c0968793 (public): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1022
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1023
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1024
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1025
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1026
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1027
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1028
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1029
  @  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1030
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1031
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1032
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1033
773
fc8034069fe1 tutorial: warn about rollback beeing obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 772
diff changeset
  1034
We do not want to publish the "bathroom changeset". Let's rollback the last transaction.
fc8034069fe1 tutorial: warn about rollback beeing obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 772
diff changeset
  1035
fc8034069fe1 tutorial: warn about rollback beeing obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 772
diff changeset
  1036
.. Warning: Rollback is actually a dangerous kind of internal command that is deprecated and should not be exposed to user. Please forget you read about it until someone fix this tutorial.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1037
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1038
  $ hg rollback
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1039
  repository tip rolled back to revision 4 (undo pull)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1040
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1041
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1042
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1043
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1044
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1045
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1046
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1047
  @  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1048
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1049
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1050
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1051
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1052
Let's make the local repo "non publishing".
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1053
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1054
  $ echo '[phases]' >> ../local/.hg/hgrc
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1055
  $ echo 'publish=false' >> ../local/.hg/hgrc
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1056
  $ echo '[phases]' >> .hg/hgrc
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1057
  $ echo 'publish=false' >> .hg/hgrc
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1058
  $ hg showconfig phases
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1059
  phases.publish=false
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1060
  $ hg -R ../local/ showconfig phases
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1061
  phases.publish=false
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1062
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1063
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1064
I can now exchange mutable changeset between "remote" and "local" repository.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1065
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1066
  $ hg pull local
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
  1067
  pulling from $TESTTMP/local (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1068
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1069
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1070
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1071
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1072
  added 1 changesets with 1 changes to 1 files
1453
8ca31deb8db7 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1452
diff changeset
  1073
  1 new obsolescence markers
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1074
  new changesets 4710c0968793
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1075
  (run 'hg update' to get a working copy)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1076
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1077
  o  4710c0968793 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1078
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1079
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1080
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1081
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1082
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1083
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1084
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1085
  @  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1086
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1087
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1088
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1089
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1090
Rebasing unstable change after pull
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1091
----------------------------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1092
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1093
Remotely someone add a new changeset on top of the mutable "bathroom" on.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1094
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1095
  $ hg up 4710c0968793 -q
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1096
  $ cat >> shopping << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1097
  > Giraffe
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1098
  > Rhino
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1099
  > Lion
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1100
  > Bear
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1101
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1102
  $ hg ci -m 'animals'
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1103
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1104
But at the same time, locally, this same "bathroom changeset" was updated.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1105
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1106
  $ cd ../local
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1107
  $ hg up 4710c0968793 -q
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1108
  $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping
637
fdbbc9b2fca2 tutorial: use commit --amend when possible
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 636
diff changeset
  1109
  $ hg commit --amend
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1110
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1111
  @  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1112
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1113
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1114
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1115
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1116
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1117
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1118
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1119
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1120
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1121
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1122
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1123
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1124
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1125
  $ 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
  1126
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1127
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1128
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1129
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1130
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1131
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1132
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1133
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1134
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1135
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1136
      		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
  1137
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1138
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1139
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1140
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1141
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1142
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1143
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1144
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1145
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1146
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1147
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1148
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1149
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1150
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1151
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1152
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1153
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1154
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1155
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1156
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1157
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1158
      		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
  1159
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1160
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1161
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1162
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1163
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1164
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1165
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1166
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1167
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1168
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1169
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1170
      		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
  1171
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1172
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1173
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1174
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1175
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1176
      		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
  1177
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1178
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1179
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1180
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1181
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1182
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1183
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1184
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1185
      		pos="1,10!",
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1186
      		shape=circle,
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1187
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1188
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1189
      	6 -> 10	 [arrowhead=none,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1190
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1191
      	12	 [fillcolor="#7F7FFF",
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1192
      		fixedsize=true,
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1193
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1194
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1195
      		label=12,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1196
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1197
      		pos="1,12!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1198
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1199
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1200
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1201
      	10 -> 12	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1202
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1203
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1204
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1205
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1206
When we pull from remote again we get an unstable state!
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1207
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1208
  $ hg pull remote
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
  1209
  pulling from $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1210
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1211
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1212
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1213
  adding file changes
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1214
  added 1 changesets with 1 changes to 1 files
3431
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1215
  1 new orphan changesets
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1216
  new changesets e4e4fa805d92
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1217
  (run 'hg update' to get a working copy)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1218
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1219
The new changeset "animal" is based on an old changeset of "bathroom". You can
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1220
see both version showing up in the log.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1221
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1222
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1223
  *  e4e4fa805d92 (draft): animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1224
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1225
  | @  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1226
  | |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1227
  x |  4710c0968793 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1228
  |/
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1229
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1230
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1231
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1232
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1233
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1234
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1235
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1236
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1237
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1238
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1239
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1240
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1241
  $ 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
  1242
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1243
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1244
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1245
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1246
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1247
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1248
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1249
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1250
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1251
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1252
      		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
  1253
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1254
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1255
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1256
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1257
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1258
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1259
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1260
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1261
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1262
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1263
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1264
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1265
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1266
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1267
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1268
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1269
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1270
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1271
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1272
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1273
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1274
      		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
  1275
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1276
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1277
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1278
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1279
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1280
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1281
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1282
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1283
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1284
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1285
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1286
      		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
  1287
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1288
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1289
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1290
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1291
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1292
      		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
  1293
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1294
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1295
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1296
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1297
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1298
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1299
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1300
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1301
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1302
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1303
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1304
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1305
      	6 -> 10	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1306
      		penwidth=2.0];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1307
      	11	 [fillcolor="#DFDFFF",
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1308
      		fixedsize=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1309
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1310
      		height=1,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1311
      		label=11,
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1312
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1313
      		pos="2,11!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1314
      		shape=pentagon,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1315
      		style="dotted, filled",
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1316
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1317
      	10 -> 11	 [arrowhead=none,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1318
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1319
      	12	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1320
      		fixedsize=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1321
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1322
      		height=1,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1323
      		label=12,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1324
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1325
      		pos="1,12!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1326
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1327
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1328
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1329
      	10 -> 12	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1330
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1331
      	11 -> 12	 [arrowtail=none,
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1332
      		dir=back,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1333
      		minlen=0,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1334
      		penwidth=2.0,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1335
      		style=dashed];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1336
      	13	 [fillcolor="#FF4F4F",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1337
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1338
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1339
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1340
      		label=13,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1341
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1342
      		pos="2,13!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1343
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1344
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1345
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1346
      	11 -> 13	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1347
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1348
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1349
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1350
640
629ec7f612aa tutorial: second replacement of hg amend by commit --amend
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 639
diff changeset
  1351
The older version 75954b8cd933 never ceased to exist in the local repo. It was
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1352
just hidden and excluded from pull and push.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1353
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1354
.. note:: In hgview there is a nice dotted relation highlighting a44c85f957d3 as a new version of 75954b8cd933. this is not yet ported to ``hg log -G``.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1355
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1356
There is now an **unstable** changeset in this history. Mercurial will refuse to
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1357
share it with the outside:
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1358
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1359
  $ hg push other
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
  1360
  pushing to $TESTTMP/other (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1361
  searching for changes
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1362
  abort: push includes orphan changeset: e4e4fa805d92!
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 486
diff changeset
  1363
  (use 'hg evolve' to get a stable history or --force to ignore warnings)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1364
  [255]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1365
 
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1366
640
629ec7f612aa tutorial: second replacement of hg amend by commit --amend
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 639
diff changeset
  1367
To resolve this unstable state, you need to rebase bf1b0d202029 onto
768
b116de5dc70d tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 767
diff changeset
  1368
a44c85f957d3. The `hg evolve` command will do this for you.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1369
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1370
It has a --dry-run option to only suggest the next move.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1371
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 486
diff changeset
  1372
  $ hg evolve --dry-run
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1373
  move:[13] animals
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1374
  atop:[12] bathroom stuff
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1375
  hg rebase -r e4e4fa805d92 -d 682004e81e71
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1376
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1377
Let's do it
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1378
639
bc2527223350 tutorial: use evolve directly
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 638
diff changeset
  1379
  $ hg evolve
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1380
  move:[13] animals
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1381
  atop:[12] bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1382
  merging shopping
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1383
  working directory is now at 2a2b36e14660
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1384
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1385
The old version of bathroom is hidden again.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1386
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1387
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1388
  @  2a2b36e14660 (draft): animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1389
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1390
  o  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1391
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1392
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1393
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1394
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1395
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1396
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1397
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1398
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1399
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1400
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1401
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1402
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1403
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1404
  $ 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
  1405
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1406
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1407
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1408
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1409
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1410
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1411
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1412
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1413
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1414
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1415
      		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
  1416
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1417
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1418
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1419
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1420
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1421
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1422
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1423
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1424
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1425
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1426
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1427
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1428
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1429
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1430
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1431
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1432
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1433
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1434
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1435
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1436
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1437
      		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
  1438
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1439
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1440
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1441
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1442
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1443
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1444
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1445
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1446
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1447
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1448
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1449
      		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
  1450
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1451
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1452
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1453
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1454
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1455
      		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
  1456
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1457
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1458
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1459
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1460
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1461
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1462
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1463
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1464
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1465
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1466
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1467
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1468
      	6 -> 10	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1469
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1470
      	12	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1471
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1472
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1473
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1474
      		label=12,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1475
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1476
      		pos="1,12!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1477
      		shape=pentagon,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1478
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1479
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1480
      	10 -> 12	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1481
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1482
      	14	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1483
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1484
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1485
      		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
  1486
      		label=14,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1487
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1488
      		pos="1,14!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1489
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1490
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1491
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1492
      	12 -> 14	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1493
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1494
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1495
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1496
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1497
We can push this evolution to remote.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1498
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1499
  $ hg push remote
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
  1500
  pushing to $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1501
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1502
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1503
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1504
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1505
  added 2 changesets with 2 changes to 1 files (+1 heads)
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1506
  2 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2289
diff changeset
  1507
  obsoleted 2 changesets
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1508
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1509
Remote get a warning that current working directory is based on an obsolete
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1510
changeset.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1511
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1512
  $ cd ../remote
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1513
  $ hg pull local # we up again to trigger the warning. it was displayed during the push
1452
1bcbd14cf159 merge back with 3.3 compat branch
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1451
diff changeset
  1514
  pulling from $TESTTMP/local (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1515
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1516
  no changes found
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1517
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1518
Now let's see where we are, and update to the successor.
750
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
  1519
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
  1520
  $ hg parents
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1521
  e4e4fa805d92 (draft): animals
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1522
  working directory parent is obsolete! (e4e4fa805d92)
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1523
  (use 'hg evolve' to update to its successor: 2a2b36e14660)
750
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
  1524
  $ hg evolve
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
  1525
  update:[8] animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1526
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1527
  working directory is now at 2a2b36e14660
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1528
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1529
Relocating unstable change after prune
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1530
----------------------------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1531
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1532
The remote guy keeps working.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1533
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1534
  $ sed -i'' -e 's/Spam/Spam Spam Spam Spam/g' shopping
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1535
  $ hg commit -m "SPAM SPAM SPAM"
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1536
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1537
I'm pulling its work locally.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1538
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1539
  $ cd ../local
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1540
  $ hg pull remote
1110
875e671c3cd8 test: add glob annotations where Mercurial's run-tests.py suggests
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
  1541
  pulling from $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1542
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1543
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1544
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1545
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1546
  added 1 changesets with 1 changes to 1 files
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1547
  new changesets fc41faf45288
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1548
  (run 'hg update' to get a working copy)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1549
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1550
  o  fc41faf45288 (draft): SPAM SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1551
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1552
  @  2a2b36e14660 (draft): animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1553
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1554
  o  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1555
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1556
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1557
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1558
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1559
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1560
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1561
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1562
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1563
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1564
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1565
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1566
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1567
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1568
  $ 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
  1569
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1570
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1571
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1572
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1573
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1574
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1575
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1576
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1577
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1578
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1579
      		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
  1580
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1581
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1582
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1583
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1584
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1585
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1586
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1587
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1588
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1589
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1590
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1591
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1592
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1593
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1594
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1595
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1596
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1597
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1598
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1599
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1600
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1601
      		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
  1602
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1603
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1604
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1605
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1606
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1607
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1608
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1609
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1610
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1611
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1612
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1613
      		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
  1614
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1615
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1616
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1617
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1618
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1619
      		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
  1620
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1621
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1622
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1623
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1624
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1625
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1626
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1627
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1628
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1629
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1630
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1631
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1632
      	6 -> 10	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1633
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1634
      	12	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1635
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1636
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1637
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1638
      		label=12,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1639
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1640
      		pos="1,12!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1641
      		shape=pentagon,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1642
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1643
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1644
      	10 -> 12	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1645
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1646
      	14	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1647
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1648
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1649
      		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
  1650
      		label=14,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1651
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1652
      		pos="1,14!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1653
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1654
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1655
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1656
      	12 -> 14	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1657
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1658
      	15	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1659
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1660
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1661
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1662
      		label=15,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1663
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1664
      		pos="1,15!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1665
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1666
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1667
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1668
      	14 -> 15	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1669
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1670
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1671
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1672
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1673
In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1674
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1675
  $ hg prune 2a2b36e14660
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1676
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1677
  working directory now at 682004e81e71
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1188
diff changeset
  1678
  1 changesets pruned
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1679
  1 new orphan changesets
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1680
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1681
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1682
The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1683
is neither dead or obsolete. My repository is in an unstable state again.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1684
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1685
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1686
  *  fc41faf45288 (draft): SPAM SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1687
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1688
  x  2a2b36e14660 (draft): animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1689
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1690
  @  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1691
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1692
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1693
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1694
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1695
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1696
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1697
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1698
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1699
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1700
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1701
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1702
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1703
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1704
  $ 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
  1705
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1706
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1707
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1708
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1709
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1710
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1711
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1712
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1713
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1714
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1715
      		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
  1716
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1717
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1718
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1719
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1720
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1721
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1722
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1723
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1724
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1725
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1726
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1727
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1728
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1729
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1730
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1731
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1732
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1733
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1734
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1735
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1736
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1737
      		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
  1738
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1739
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1740
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1741
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1742
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1743
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1744
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1745
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1746
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1747
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1748
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1749
      		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
  1750
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1751
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1752
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1753
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1754
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1755
      		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
  1756
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1757
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1758
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1759
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1760
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1761
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1762
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1763
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1764
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1765
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1766
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1767
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1768
      	6 -> 10	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1769
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1770
      	12	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1771
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1772
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1773
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1774
      		label=12,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1775
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1776
      		pos="1,12!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1777
      		shape=pentagon,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1778
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1779
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1780
      	10 -> 12	 [arrowhead=none,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1781
      		penwidth=2.0];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1782
      	14	 [fillcolor="#DFDFFF",
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1783
      		fixedsize=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1784
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1785
      		height=1,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1786
      		label=14,
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1787
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1788
      		pos="2,14!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1789
      		shape=pentagon,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1790
      		style="dotted, filled",
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1791
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1792
      	12 -> 14	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1793
      		penwidth=2.0];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1794
      	15	 [fillcolor="#FF4F4F",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1795
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1796
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1797
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1798
      		label=15,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1799
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1800
      		pos="2,15!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1801
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1802
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1803
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1804
      	14 -> 15	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1805
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1806
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1807
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1808
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1809
  $ hg log -r "orphan()"
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1810
  fc41faf45288 (draft): SPAM SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1811
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1812
#if docgraph-ext
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1813
  $ hg docgraph -r "orphan()" --sphinx-directive --rankdir LR #rest-ignore
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1814
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1815
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1816
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1817
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1818
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1819
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1820
      	node [label="\N"];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1821
      	15	 [fillcolor="#FF4F4F",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1822
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1823
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1824
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1825
      		label=15,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1826
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1827
      		pos="1,15!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1828
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1829
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1830
      		width=1];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1831
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1832
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1833
636
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 635
diff changeset
  1834
  $ hg evolve
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1835
  move:[15] SPAM SPAM SPAM
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1836
  atop:[12] bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1837
  merging shopping
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1838
  working directory is now at e6cfcb672150
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1839
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1840
  $ hg log -G
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1841
  @  e6cfcb672150 (draft): SPAM SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1842
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1843
  o  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1844
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1845
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1846
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1847
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1848
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1849
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1850
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1851
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1852
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1853
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1854
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1855
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1856
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1857
  $ 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
  1858
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1859
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1860
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1861
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1862
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1863
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1864
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1865
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1866
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1867
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1868
      		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
  1869
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1870
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1871
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1872
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1873
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1874
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1875
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1876
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1877
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1878
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1879
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1880
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1881
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1882
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1883
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1884
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1885
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1886
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1887
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1888
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1889
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1890
      		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
  1891
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1892
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1893
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1894
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1895
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1896
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1897
      	4 -> 5	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1898
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1899
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1900
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1901
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1902
      		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
  1903
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1904
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1905
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1906
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1907
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1908
      		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
  1909
      	5 -> 6	 [arrowhead=none,
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1910
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1911
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1912
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1913
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1914
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1915
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1916
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1917
      		pos="1,10!",
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1918
      		shape=circle,
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1919
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1920
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1921
      	6 -> 10	 [arrowhead=none,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1922
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1923
      	12	 [fillcolor="#7F7FFF",
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1924
      		fixedsize=true,
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1925
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1926
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1927
      		label=12,
3000
bd7e8be29542 branching: merge future 6.7.0 in the stable branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2965
diff changeset
  1928
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1929
      		pos="1,12!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1930
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1931
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1932
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1933
      	10 -> 12	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1934
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1935
      	16	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1936
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1937
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1938
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1939
      		label=16,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1940
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1941
      		pos="1,16!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1942
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1943
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1944
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1945
      	12 -> 16	 [arrowhead=none,
2965
e036aab3d0cb doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2959
diff changeset
  1946
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1947
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1948
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1949
770
303d27c76021 tutorial: update divergent changeset section
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 769
diff changeset
  1950
Handling Divergent amend
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1951
----------------------------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1952
803
b96d51a357bd test: get rid of all reference to conflicting changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 774
diff changeset
  1953
We can detect that multiple diverging amendments have been made.
770
303d27c76021 tutorial: update divergent changeset section
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 769
diff changeset
  1954
The `evolve` command can solve this situation. But all corner case are not
303d27c76021 tutorial: update divergent changeset section
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 769
diff changeset
  1955
handled now.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1956
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1957
This section needs to be written.