tests/test-tutorial.t
author Pulkit Goyal <7895pulkit@gmail.com>
Fri, 02 Feb 2018 13:59:33 +0530
changeset 3475 a03bb02dfaba
parent 3453 32ed5b6fadd3
child 3590 d5adce52cef4
child 4049 25981fae92f9
permissions -rw-r--r--
grab: preserve phase of the grabbed changeset This patch fixes the wrong behavior of loosing secret phase of the grabbed changeset.
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 .
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   813
  $ 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
   814
  @  4710c0968793 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   815
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
   816
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   817
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
   818
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   819
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   820
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   821
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   822
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   823
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   824
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   825
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   826
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   827
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   828
  $ 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
   829
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   830
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   831
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   832
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   833
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   834
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   835
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   836
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   837
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   838
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   839
      		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
   840
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   841
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   842
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   843
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   844
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   845
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   846
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   847
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   848
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   849
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   850
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   851
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   852
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   853
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   854
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   855
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   856
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   857
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   858
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   859
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   860
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   861
      		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
   862
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   863
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   864
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   865
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   866
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   867
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   868
      	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
   869
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   870
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   871
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   872
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   873
      		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
   874
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   875
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   876
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   877
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   878
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   879
      		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
   880
      	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
   881
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   882
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   883
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   884
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   885
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   886
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   887
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   888
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   889
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   890
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   891
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   892
      	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
   893
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   894
      	11	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   895
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   896
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   897
      		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
   898
      		label=11,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   899
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   900
      		pos="1,11!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   901
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   902
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
   903
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   904
      	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
   905
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   906
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
   907
#endif
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   908
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   909
Splitting change
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   910
------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   911
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
   912
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
   913
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
   914
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
  $ 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
   916
  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
   917
  
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
  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
   919
  
891
36c1c80e99a3 commands: small language fixes in help
Brendan Cully <brendan@kublai.com>
parents: 867
diff changeset
   920
      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
   921
      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
   922
      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
   923
      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
   924
  
867
6a67606e1c34 evolve: fix typos in uncommit docstring
André Sintzoff <andre.sintzoff@gmail.com>
parents: 803
diff changeset
   925
      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
   926
      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
   927
  
1058
00bc31523074 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
   928
      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
   929
      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
   930
      directory.
00bc31523074 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
   931
  
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
   932
      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
   933
  
1064
95d84c8b4bcc test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1058
diff changeset
   934
  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
   935
  
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
   -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
   937
   -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
   938
      --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
   939
   -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
   940
   -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
   941
   -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
   942
   -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
   943
   -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
   944
   -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
   945
   -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
   946
   -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
   947
   -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
   948
  
1064
95d84c8b4bcc test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1058
diff changeset
   949
  (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
   950
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
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
   953
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   954
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   955
Collapsing change
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   956
------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   957
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
   958
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
   959
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
   960
  $ hg help fold
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 957
diff changeset
   961
  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
   962
  
934
f13facb01ac5 fold: add squash as a possible alias
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 933
diff changeset
   963
  aliases: squash
f13facb01ac5 fold: add squash as a possible alias
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 933
diff changeset
   964
  
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 957
diff changeset
   965
  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
   966
  
1782
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1756
diff changeset
   967
      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
   968
      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
   969
  
1782
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1756
diff changeset
   970
      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
   971
      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
   972
      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
   973
  
1064
95d84c8b4bcc test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1058
diff changeset
   974
  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
   975
  
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 957
diff changeset
   976
   -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
   977
      --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
   978
      --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
   979
   -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
   980
   -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
   981
   -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
   982
   -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
   983
   -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
   984
   -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
   985
   -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
   986
  
1064
95d84c8b4bcc test: update help output to future 3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1058
diff changeset
   987
  (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
   988
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
Collaboration
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   992
-----------------------
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
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
   995
Sharing mutable changesets
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   996
----------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   997
768
b116de5dc70d tutorial: fix some various typo
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 767
diff changeset
   998
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
   999
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
  1000
behavior where exchanged changeset are automatically published.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1001
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1002
  $ cd ../remote
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1003
  $ hg -R ../local/ showconfig phases
1113
4b37588bee3b test: adapt to mercurial changes
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1111
diff changeset
  1004
  [1]
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1005
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1006
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
  1007
is ``true`` by default.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1008
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1009
  $ 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
  1010
  pulling from $TESTTMP/local (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1011
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1012
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1013
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1014
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1015
  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
  1016
  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
  1017
  new changesets 4710c0968793
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1018
  (run 'hg update' to get a working copy)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1019
  $ 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
  1020
  o  4710c0968793 (public): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1021
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1022
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1023
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1024
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1025
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1026
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1027
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1028
  @  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1029
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1030
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1031
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1032
773
fc8034069fe1 tutorial: warn about rollback beeing obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 772
diff changeset
  1033
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
  1034
fc8034069fe1 tutorial: warn about rollback beeing obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 772
diff changeset
  1035
.. 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
  1036
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1037
  $ hg rollback
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1038
  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
  1039
  $ 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
  1040
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1041
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1042
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1043
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1044
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1045
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1046
  @  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1047
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1048
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1049
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1050
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1051
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
  1052
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1053
  $ echo '[phases]' >> ../local/.hg/hgrc
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1054
  $ echo 'publish=false' >> ../local/.hg/hgrc
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1055
  $ echo '[phases]' >> .hg/hgrc
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1056
  $ echo 'publish=false' >> .hg/hgrc
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1057
  $ hg showconfig phases
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1058
  phases.publish=false
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1059
  $ hg -R ../local/ showconfig phases
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1060
  phases.publish=false
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1061
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
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
  1064
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1065
  $ 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
  1066
  pulling from $TESTTMP/local (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1067
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1068
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1069
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1070
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1071
  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
  1072
  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
  1073
  new changesets 4710c0968793
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1074
  (run 'hg update' to get a working copy)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1075
  $ 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
  1076
  o  4710c0968793 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1077
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1078
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1079
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1080
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1081
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1082
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1083
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1084
  @  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1085
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1086
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1087
  
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
Rebasing unstable change after pull
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1090
----------------------------------------------
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
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
  1093
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1094
  $ hg up 4710c0968793 -q
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1095
  $ cat >> shopping << EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1096
  > Giraffe
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1097
  > Rhino
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1098
  > Lion
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1099
  > Bear
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1100
  > EOF
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1101
  $ hg ci -m 'animals'
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1102
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1103
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
  1104
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1105
  $ 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
  1106
  $ hg up 4710c0968793 -q
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1107
  $ 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
  1108
  $ hg commit --amend
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1109
  $ 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
  1110
  @  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1111
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1112
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1113
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1114
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1115
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1116
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1117
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1118
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1119
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1120
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1121
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1122
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1123
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1124
  $ 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
  1125
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1126
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1127
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1128
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1129
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1130
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1131
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1132
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1133
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1134
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1135
      		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
  1136
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1137
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1138
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1139
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1140
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1141
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1142
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1143
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1144
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1145
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1146
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1147
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1148
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1149
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1150
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1151
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1152
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1153
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1154
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1155
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1156
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1157
      		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
  1158
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1159
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1160
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1161
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1162
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1163
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1164
      	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
  1165
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1166
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1167
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1168
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1169
      		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
  1170
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1171
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1172
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1173
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1174
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1175
      		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
  1176
      	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
  1177
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1178
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1179
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1180
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1181
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1182
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1183
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1184
      		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
  1185
      		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
  1186
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1187
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1188
      	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
  1189
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1190
      	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
  1191
      		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
  1192
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1193
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1194
      		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
  1195
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1196
      		pos="1,12!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1197
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1198
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1199
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1200
      	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
  1201
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1202
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1203
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1204
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1205
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
  1206
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1207
  $ 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
  1208
  pulling from $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1209
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1210
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1211
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1212
  adding file changes
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1213
  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
  1214
  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
  1215
  new changesets e4e4fa805d92
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1216
  (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
  1217
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1218
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
  1219
see both version showing up in the log.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1220
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1221
  $ 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
  1222
  *  e4e4fa805d92 (draft): animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1223
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1224
  | @  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1225
  | |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1226
  x |  4710c0968793 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1227
  |/
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1228
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1229
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1230
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1231
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1232
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1233
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1234
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1235
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1236
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1237
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1238
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1239
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1240
  $ 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
  1241
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1242
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1243
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1244
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1245
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1246
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1247
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1248
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1249
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1250
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1251
      		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
  1252
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1253
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1254
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1255
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1256
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1257
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1258
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1259
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1260
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1261
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1262
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1263
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1264
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1265
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1266
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1267
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1268
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1269
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1270
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1271
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1272
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1273
      		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
  1274
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1275
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1276
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1277
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1278
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1279
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1280
      	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
  1281
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1282
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1283
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1284
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1285
      		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
  1286
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1287
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1288
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1289
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1290
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1291
      		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
  1292
      	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
  1293
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1294
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1295
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1296
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1297
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1298
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1299
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1300
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1301
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1302
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1303
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1304
      	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
  1305
      		penwidth=2.0];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1306
      	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
  1307
      		fixedsize=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1308
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1309
      		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
  1310
      		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
  1311
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1312
      		pos="2,11!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1313
      		shape=pentagon,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1314
      		style="dotted, filled",
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1315
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1316
      	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
  1317
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1318
      	12	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1319
      		fixedsize=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1320
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1321
      		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
  1322
      		label=12,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1323
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1324
      		pos="1,12!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1325
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1326
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1327
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1328
      	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
  1329
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1330
      	11 -> 12	 [arrowtail=none,
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1331
      		dir=back,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1332
      		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
  1333
      		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
  1334
      		style=dashed];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1335
      	13	 [fillcolor="#FF4F4F",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1336
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1337
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1338
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1339
      		label=13,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1340
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1341
      		pos="2,13!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1342
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1343
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1344
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1345
      	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
  1346
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1347
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1348
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1349
640
629ec7f612aa tutorial: second replacement of hg amend by commit --amend
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 639
diff changeset
  1350
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
  1351
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
  1352
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1353
.. 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
  1354
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1355
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
  1356
share it with the outside:
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1357
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1358
  $ 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
  1359
  pushing to $TESTTMP/other (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1360
  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
  1361
  abort: push includes orphan changeset: e4e4fa805d92!
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 486
diff changeset
  1362
  (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
  1363
  [255]
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1364
 
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1365
640
629ec7f612aa tutorial: second replacement of hg amend by commit --amend
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 639
diff changeset
  1366
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
  1367
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
  1368
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1369
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
  1370
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 486
diff changeset
  1371
  $ hg evolve --dry-run
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1372
  move:[13] animals
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1373
  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
  1374
  hg rebase -r e4e4fa805d92 -d 682004e81e71
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1375
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1376
Let's do it
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1377
639
bc2527223350 tutorial: use evolve directly
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 638
diff changeset
  1378
  $ hg evolve
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1379
  move:[13] animals
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1380
  atop:[12] bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1381
  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
  1382
  working directory is now at 2a2b36e14660
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1383
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1384
The old version of bathroom is hidden again.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1385
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1386
  $ 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
  1387
  @  2a2b36e14660 (draft): animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1388
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1389
  o  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1390
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1391
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1392
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1393
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1394
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1395
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1396
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1397
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1398
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1399
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1400
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1401
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1402
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1403
  $ 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
  1404
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1405
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1406
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1407
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1408
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1409
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1410
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1411
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1412
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1413
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1414
      		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
  1415
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1416
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1417
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1418
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1419
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1420
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1421
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1422
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1423
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1424
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1425
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1426
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1427
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1428
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1429
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1430
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1431
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1432
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1433
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1434
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1435
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1436
      		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
  1437
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1438
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1439
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1440
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1441
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1442
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1443
      	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
  1444
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1445
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1446
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1447
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1448
      		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
  1449
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1450
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1451
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1452
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1453
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1454
      		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
  1455
      	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
  1456
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1457
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1458
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1459
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1460
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1461
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1462
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1463
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1464
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1465
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1466
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1467
      	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
  1468
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1469
      	12	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1470
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1471
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1472
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1473
      		label=12,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1474
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1475
      		pos="1,12!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1476
      		shape=pentagon,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1477
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1478
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1479
      	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
  1480
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1481
      	14	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1482
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1483
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1484
      		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
  1485
      		label=14,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1486
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1487
      		pos="1,14!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1488
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1489
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1490
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1491
      	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
  1492
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1493
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1494
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1495
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1496
We can push this evolution to remote.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1497
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1498
  $ 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
  1499
  pushing to $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1500
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1501
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1502
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1503
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1504
  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
  1505
  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
  1506
  obsoleted 2 changesets
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1507
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1508
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
  1509
changeset.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1510
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1511
  $ cd ../remote
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1512
  $ 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
  1513
  pulling from $TESTTMP/local (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1514
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1515
  no changes found
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1516
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1517
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
  1518
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
  1519
  $ 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
  1520
  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
  1521
  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
  1522
  (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
  1523
  $ 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
  1524
  update:[8] animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1525
  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
  1526
  working directory is now at 2a2b36e14660
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1527
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1528
Relocating unstable change after prune
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1529
----------------------------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1530
2822
56733f2ddb04 test: fix typos in evolve tutorial
Boris Feld <boris.feld@octobus.net>
parents: 2768
diff changeset
  1531
The remote guy keeps working.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1532
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1533
  $ 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
  1534
  $ hg commit -m "SPAM SPAM SPAM"
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1535
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1536
I'm pulling its work locally.
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1537
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1538
  $ cd ../local
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1539
  $ 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
  1540
  pulling from $TESTTMP/remote (glob)
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1541
  searching for changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1542
  adding changesets
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1543
  adding manifests
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1544
  adding file changes
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1545
  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
  1546
  new changesets fc41faf45288
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1547
  (run 'hg update' to get a working copy)
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1548
  $ 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
  1549
  o  fc41faf45288 (draft): SPAM SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1550
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1551
  @  2a2b36e14660 (draft): animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1552
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1553
  o  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1554
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1555
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1556
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1557
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1558
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1559
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1560
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1561
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1562
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1563
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1564
  
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1565
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1566
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1567
  $ 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
  1568
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1569
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1570
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1571
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1572
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1573
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1574
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1575
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1576
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1577
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1578
      		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
  1579
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1580
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1581
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1582
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1583
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1584
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1585
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1586
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1587
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1588
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1589
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1590
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1591
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1592
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1593
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1594
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1595
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1596
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1597
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1598
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1599
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1600
      		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
  1601
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1602
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1603
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1604
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1605
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1606
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1607
      	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
  1608
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1609
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1610
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1611
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1612
      		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
  1613
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1614
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1615
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1616
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1617
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1618
      		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
  1619
      	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
  1620
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1621
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1622
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1623
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1624
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1625
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1626
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1627
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1628
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1629
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1630
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1631
      	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
  1632
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1633
      	12	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1634
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1635
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1636
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1637
      		label=12,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1638
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1639
      		pos="1,12!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1640
      		shape=pentagon,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1641
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1642
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1643
      	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
  1644
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1645
      	14	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1646
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1647
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1648
      		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
  1649
      		label=14,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1650
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1651
      		pos="1,14!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1652
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1653
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1654
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1655
      	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
  1656
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1657
      	15	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1658
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1659
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1660
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1661
      		label=15,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1662
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1663
      		pos="1,15!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1664
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1665
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1666
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1667
      	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
  1668
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1669
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1670
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1671
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1672
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
  1673
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1674
  $ hg prune 2a2b36e14660
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1675
  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
  1676
  working directory now at 682004e81e71
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1188
diff changeset
  1677
  1 changesets pruned
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1678
  1 new orphan changesets
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1679
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
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
  1682
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
  1683
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1684
  $ 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
  1685
  *  fc41faf45288 (draft): SPAM SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1686
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1687
  x  2a2b36e14660 (draft): animals
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1688
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1689
  @  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1690
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1691
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1692
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1693
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1694
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1695
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1696
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1697
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1698
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1699
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1700
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1701
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1702
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1703
  $ 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
  1704
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1705
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1706
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1707
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1708
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1709
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1710
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1711
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1712
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1713
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1714
      		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
  1715
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1716
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1717
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1718
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1719
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1720
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1721
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1722
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1723
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1724
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1725
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1726
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1727
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1728
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1729
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1730
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1731
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1732
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1733
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1734
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1735
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1736
      		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
  1737
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1738
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1739
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1740
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1741
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1742
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1743
      	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
  1744
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1745
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1746
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1747
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1748
      		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
  1749
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1750
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1751
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1752
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1753
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1754
      		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
  1755
      	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
  1756
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1757
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1758
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1759
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1760
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1761
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1762
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1763
      		pos="1,10!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1764
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1765
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1766
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1767
      	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
  1768
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1769
      	12	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1770
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1771
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1772
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1773
      		label=12,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1774
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1775
      		pos="1,12!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1776
      		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
  1777
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1778
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1779
      	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
  1780
      		penwidth=2.0];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1781
      	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
  1782
      		fixedsize=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1783
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1784
      		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
  1785
      		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
  1786
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1787
      		pos="2,14!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1788
      		shape=pentagon,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1789
      		style="dotted, filled",
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1790
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1791
      	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
  1792
      		penwidth=2.0];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1793
      	15	 [fillcolor="#FF4F4F",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1794
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1795
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1796
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1797
      		label=15,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1798
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1799
      		pos="2,15!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1800
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1801
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1802
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1803
      	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
  1804
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1805
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1806
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1807
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1808
  $ 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
  1809
  fc41faf45288 (draft): SPAM SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1810
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1811
#if docgraph-ext
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1812
  $ 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
  1813
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1814
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1815
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1816
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1817
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1818
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1819
      	node [label="\N"];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1820
      	15	 [fillcolor="#FF4F4F",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1821
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1822
      		group=default_alt,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1823
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1824
      		label=15,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1825
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1826
      		pos="1,15!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1827
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1828
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1829
      		width=1];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1830
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1831
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1832
636
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 635
diff changeset
  1833
  $ hg evolve
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1834
  move:[15] SPAM SPAM SPAM
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1835
  atop:[12] bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1836
  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
  1837
  working directory is now at e6cfcb672150
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1838
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1839
  $ 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
  1840
  @  e6cfcb672150 (draft): SPAM SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1841
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1842
  o  682004e81e71 (draft): bathroom stuff
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1843
  |
3453
32ed5b6fadd3 grab: add a command to grab a commit and update to it
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3431
diff changeset
  1844
  o  57e9caedbcb8 (public): SPAM SPAM
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1845
  |
1595
edcd2f0474c8 test: back hash change from 'extra' content change out
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1543
diff changeset
  1846
  o  41aff6a42b75 (public): adding fruit
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1847
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1848
  o  dfd3a2d7691e (public): adding condiment
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1849
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1850
  o  9ca060c80d74 (public): SPAM
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1851
  |
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1852
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1853
  
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1854
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1855
#if docgraph-ext
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1856
  $ 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
  1857
  .. graphviz::
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1858
  
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1859
      strict digraph "Mercurial graph" {
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1860
      	graph [rankdir=LR,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1861
      		splines=polyline
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1862
      	];
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1863
      	node [label="\N"];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1864
      	0	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1865
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1866
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1867
      		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
  1868
      		label=0,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1869
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1870
      		pos="1,0!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1871
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1872
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1873
      		width=1];
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1874
      	4	 [fillcolor="#7F7FFF",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1875
      		fixedsize=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1876
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1877
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1878
      		label=4,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1879
      		pin=true,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1880
      		pos="1,4!",
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1881
      		shape=circle,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1882
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1883
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1884
      	0 -> 4	 [arrowhead=none,
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1885
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1886
      	5	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1887
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1888
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1889
      		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
  1890
      		label=5,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1891
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1892
      		pos="1,5!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1893
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1894
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1895
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1896
      	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
  1897
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1898
      	6	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1899
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1900
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1901
      		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
  1902
      		label=6,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1903
      		pin=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1904
      		pos="1,6!",
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1905
      		shape=circle,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1906
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1907
      		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
  1908
      	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
  1909
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1910
      	10	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1911
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1912
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1913
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1914
      		label=10,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1915
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1916
      		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
  1917
      		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
  1918
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1919
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1920
      	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
  1921
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1922
      	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
  1923
      		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
  1924
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1925
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1926
      		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
  1927
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1928
      		pos="1,12!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1929
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1930
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1931
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1932
      	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
  1933
      		penwidth=2.0];
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1934
      	16	 [fillcolor="#7F7FFF",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1935
      		fixedsize=true,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1936
      		group=default,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1937
      		height=1,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1938
      		label=16,
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1939
      		pin=true,
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1940
      		pos="1,16!",
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1941
      		shape=pentagon,
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1942
      		style=filled,
3316
76e5b5ae6864 docgraph: update test output with new output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3220
diff changeset
  1943
      		width=1];
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1944
      	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
  1945
      		penwidth=2.0];
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1946
      }
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1947
#endif
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents: 2951
diff changeset
  1948
770
303d27c76021 tutorial: update divergent changeset section
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 769
diff changeset
  1949
Handling Divergent amend
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1950
----------------------------------------------
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1951
803
b96d51a357bd test: get rid of all reference to conflicting changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 774
diff changeset
  1952
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
  1953
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
  1954
handled now.
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
  1955
654
c56109c9aebf tutorial: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 652
diff changeset
  1956
This section needs to be written.