docs/tutorials/tutorial.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Tue, 05 Jun 2012 21:52:44 +0200
changeset 257 bbd1adb262fd
parent 250 5e47d361206a
child 259 9886034199af
permissions -rw-r--r--
zsh does not like "`" in << EOF
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     1
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
     2
Initial setup
250
5e47d361206a [doc] Specify that tuto hg configuration is used for testing.
Damien Garaud <damien.garaud@logilab.fr>
parents: 236
diff changeset
     3
-------------
5e47d361206a [doc] Specify that tuto hg configuration is used for testing.
Damien Garaud <damien.garaud@logilab.fr>
parents: 236
diff changeset
     4
5e47d361206a [doc] Specify that tuto hg configuration is used for testing.
Damien Garaud <damien.garaud@logilab.fr>
parents: 236
diff changeset
     5
This Mercurial configuration example is used for testing.
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
     6
.. Various setup
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     7
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     8
  $ cat >> $HGRCPATH << EOF
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
     9
  > [ui]
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    10
  > logtemplate ="{node|short} ({phase}): {desc}\n"
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    11
  > [diff]
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    12
  > git = 1
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    13
  > [alias]
257
bbd1adb262fd zsh does not like "`" in << EOF
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 250
diff changeset
    14
  > # "-d '0 0'" means that the new commit will be at January 1st 1970.
250
5e47d361206a [doc] Specify that tuto hg configuration is used for testing.
Damien Garaud <damien.garaud@logilab.fr>
parents: 236
diff changeset
    15
  > # This is used for stable hash during test
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    16
  > amend = amend -d '0 0'
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    17
  > [extensions]
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    18
  > hgext.graphlog=
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    19
  > EOF
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    20
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    21
  $ hg init local
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    22
  $ cat >> local/.hg/hgrc << EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    23
  > [paths]
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    24
  > remote = ../remote
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    25
  > other = ../other
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    26
  > [ui]
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    27
  > user = Babar the King
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    28
  > EOF
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    29
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    30
  $ hg init remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    31
  $ cat >> remote/.hg/hgrc << EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    32
  > [paths]
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    33
  > local = ../local
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    34
  > [ui]
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    35
  > user = Celestine the Queen
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    36
  > EOF
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
    37
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    38
  $ hg init other
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    39
  $ cat >> other/.hg/hgrc << EOF
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    40
  > [ui]
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    41
  > user = Princess Flore
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    42
  > EOF
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    43
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    44
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    45
This tutorial use the following configuration for Mercurial:
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    46
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    47
A compact log template with phase data:
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    48
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    49
  $ hg showconfig ui
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    50
  ui.slash=True
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    51
  ui.logtemplate="{node|short} ({phase}): {desc}\n"
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    52
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    53
Improved git format diff:
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    54
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    55
  $ hg showconfig diff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    56
  diff.git=1
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    57
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    58
And the graphlog extension
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    59
  $ hg showconfig extensions
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    60
  extensions.hgext.graphlog=
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    61
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    62
And of course, we anabled the experimental extensions for mutable history:
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    63
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    64
  $ $(dirname $TESTDIR)/enable.sh >> $HGRCPATH 2> /dev/null
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    65
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    66
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    67
-----------------------
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    68
Single Developer Usage
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    69
-----------------------
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    70
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    71
This tutorial shows how to use evolution to rewrite history locally.
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    72
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    73
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    74
Fixing mistake with `hg amend`
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    75
--------------------------------
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    76
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    77
We are versionning a shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    78
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    79
  $ cd local
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    80
  $ cat  >> shopping << EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    81
  > Spam
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    82
  > Whizzo butter
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    83
  > Albatross
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    84
  > Rat (rather a lot)
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    85
  > Jugged fish
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    86
  > Blancmange
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    87
  > Salmon mousse
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    88
  > EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    89
  $ hg commit -A -m "Monthy Python Shopping list"
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    90
  adding shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    91
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
    92
Its first version is shared with the outside.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    93
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    94
  $ hg push remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    95
  pushing to $TESTTMP/remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    96
  searching for changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    97
  adding changesets
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    98
  adding manifests
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    99
  adding file changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   100
  added 1 changesets with 1 changes to 1 files
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   101
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   102
Later I add additional item to my list
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   103
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   104
  $ cat >> shopping << EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   105
  > Egg
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   106
  > Suggar
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   107
  > Vinegar
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   108
  > Oil
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   109
  > EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   110
  $ hg commit -m "adding condiment"
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   111
  $ cat >> shopping << EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   112
  > Bananos
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   113
  > Pear
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   114
  > Apple
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   115
  > EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   116
  $ hg commit -m "adding fruit"
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   117
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   118
This history is very linear
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   119
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   120
  $ hg glog
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   121
  @  d85de4546133 (draft): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   122
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   123
  o  4d5dc8187023 (draft): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   124
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   125
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   126
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   127
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   128
But a typo was made in Babanas!
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   129
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   130
  $ hg export tip
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   131
  # HG changeset patch
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   132
  # User test
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   133
  # Date 0 0
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   134
  # Node ID d85de4546133030c82d257bbcdd9b1b416d0c31c
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   135
  # Parent  4d5dc81870237d492284826e21840b2ca00e26d1
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   136
  adding fruit
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   137
  
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   138
  diff --git a/shopping b/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   139
  --- a/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   140
  +++ b/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   141
  @@ -9,3 +9,6 @@
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   142
   Suggar
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   143
   Vinegar
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   144
   Oil
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   145
  +Bananos
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   146
  +Pear
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   147
  +Apple
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   148
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   149
The faulty changeset is in the "draft" phase because he was not exchanged with
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   150
the outside. The first one have been exchanged and is an immutable public
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   151
changeset.
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   152
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   153
  $ hg glog
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   154
  @  d85de4546133 (draft): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   155
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   156
  o  4d5dc8187023 (draft): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   157
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   158
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   159
  
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   160
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   161
hopefully. I can use hg amend to rewrite my faulty changeset!
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   162
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   163
  $ sed -i'' -e s/Bananos/Banana/ shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   164
  $ hg diff
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   165
  diff --git a/shopping b/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   166
  --- a/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   167
  +++ b/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   168
  @@ -9,6 +9,6 @@
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   169
   Suggar
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   170
   Vinegar
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   171
   Oil
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   172
  -Bananos
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   173
  +Banana
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   174
   Pear
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   175
   Apple
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   176
  $ hg amend
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   177
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   178
A new changeset with the right diff replace the wrong one.
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   179
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   180
  $ hg glog
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   181
  @  0cacb48f4482 (draft): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   182
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   183
  o  4d5dc8187023 (draft): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   184
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   185
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   186
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   187
  $ hg export tip
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   188
  # HG changeset patch
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   189
  # User test
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   190
  # Date 0 0
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   191
  # Node ID 0cacb48f44828d2fd31c4e45e18fde32a5b2f07b
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   192
  # Parent  4d5dc81870237d492284826e21840b2ca00e26d1
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   193
  adding fruit
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   194
  
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   195
  diff --git a/shopping b/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   196
  --- a/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   197
  +++ b/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   198
  @@ -9,3 +9,6 @@
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   199
   Suggar
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   200
   Vinegar
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   201
   Oil
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   202
  +Banana
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   203
  +Pear
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   204
  +Apple
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   205
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   206
Getting Ride of branchy history
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   207
----------------------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   208
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   209
While I was working on my list. someone help made a change remotly.
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   210
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   211
  $ cd ../remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   212
  $ hg up -q
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   213
  $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   214
  $ hg ci -m 'SPAM'
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   215
  $ cd ../local
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   216
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   217
I'll get this remote changeset when pulling
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   218
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   219
  $ hg pull remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   220
  pulling from $TESTTMP/remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   221
  searching for changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   222
  adding changesets
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   223
  adding manifests
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   224
  adding file changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   225
  added 1 changesets with 1 changes to 1 files (+1 heads)
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   226
  (run 'hg heads .' to see heads, 'hg merge' to merge)
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   227
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   228
I now have a new heads. Note that this remote head is immutable
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   229
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   230
  $ hg log -G
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   231
  o  9ca060c80d74 (public): SPAM
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   232
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   233
  | @  0cacb48f4482 (draft): adding fruit
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   234
  | |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   235
  | o  4d5dc8187023 (draft): adding condiment
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   236
  |/
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   237
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   238
  
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   239
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   240
instead of merging my head with the new one. I'm going to rebase my work
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   241
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   242
  $ hg diff
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   243
  $ hg rebase -d 9ca060c80d74 -s 4d5dc8187023
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   244
  merging shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   245
  merging shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   246
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   247
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   248
My local work is now rebased on the remote one.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   249
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   250
  $ hg log -G
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   251
  @  387187ad9bd9 (draft): adding fruit
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   252
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   253
  o  dfd3a2d7691e (draft): adding condiment
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   254
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   255
  o  9ca060c80d74 (public): SPAM
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   256
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   257
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   258
  
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   259
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   260
Removing changeset
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   261
------------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   262
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   263
I add new item to my list
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   264
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   265
  $ cat >> shopping << EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   266
  > car
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   267
  > bus
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   268
  > plane
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   269
  > boat
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   270
  > EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   271
  $ hg ci -m 'transport'
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   272
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   273
  @  d58c77aa15d7 (draft): transport
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   274
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   275
  o  387187ad9bd9 (draft): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   276
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   277
  o  dfd3a2d7691e (draft): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   278
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   279
  o  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   280
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   281
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   282
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   283
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   284
I have a new commit but I realize that don't want it. (transport shop list does
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   285
not fit well in my standard shopping list)
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   286
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   287
  $ hg kill . # . is for working directory parent
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   288
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   289
  working directory now at 387187ad9bd9
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   290
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   291
The silly changeset is gone.
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   292
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   293
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   294
  @  387187ad9bd9 (draft): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   295
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   296
  o  dfd3a2d7691e (draft): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   297
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   298
  o  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   299
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   300
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   301
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   302
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   303
Reordering changeset
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   304
------------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   305
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   306
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   307
We create two changesets.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   308
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   309
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   310
  $ cat >> shopping << EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   311
  > Shampoo
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   312
  > Toothbrush
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   313
  > ... More bathroom stuff to come
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   314
  > Towel
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   315
  > Soap
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   316
  > EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   317
  $ hg ci -m 'bathroom stuff' -q # XXX remove the -q
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   318
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   319
  $ sed -i'' -e 's/Spam/Spam Spam Spam/g' shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   320
  $ hg ci -m 'SPAM SPAM'
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   321
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   322
  @  c48f32fb1787 (draft): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   323
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   324
  o  8d39a843582d (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   325
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   326
  o  387187ad9bd9 (draft): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   327
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   328
  o  dfd3a2d7691e (draft): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   329
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   330
  o  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   331
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   332
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   333
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   334
236
5236927419bf [doc] fix tutorial warning
Pierre-Yves.David@ens-lyon.org
parents: 229
diff changeset
   335
.. note: don't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   336
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   337
I now want to push to remote all my change but the bathroom one that i'm not
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   338
totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" not children of
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   339
"bathroom stuff"
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   340
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   341
You can use 'rebase -r' or 'graft -O' for that:
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   342
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   343
  $ hg up 'p1(8d39a843582d)' # going on "bathroom stuff" parent
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   344
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   345
  $ hg graft -O c48f32fb1787 # moving "SPAM SPAM" to the working directory parent
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   346
  grafting revision 10
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   347
  merging shopping
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   348
  $ hg log -G
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   349
  @  a2fccc2e7b08 (draft): SPAM SPAM
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   350
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   351
  | o  8d39a843582d (draft): bathroom stuff
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   352
  |/
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   353
  o  387187ad9bd9 (draft): adding fruit
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   354
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   355
  o  dfd3a2d7691e (draft): adding condiment
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   356
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   357
  o  9ca060c80d74 (public): SPAM
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   358
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   359
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   360
  
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   361
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   362
We have a new SPAM SPAM version without the bathroom stuff
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   363
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   364
  $ grep Spam shopping  # enouth spam
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   365
  Spam Spam Spam Spam Spam Spam Spam Spam Spam
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   366
  $ grep Toothbrush shopping # no Toothbrush
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   367
  [1]
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   368
  $ hg export .
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   369
  # HG changeset patch
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   370
  # User test
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   371
  # Date 0 0
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   372
  # Node ID a2fccc2e7b08bbce6af7255b989453f7089e4cf0
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   373
  # Parent  387187ad9bd9d8f9a00a9fa804a26231db547429
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   374
  SPAM SPAM
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   375
  
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   376
  diff --git a/shopping b/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   377
  --- a/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   378
  +++ b/shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   379
  @@ -1,4 +1,4 @@
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   380
  -Spam Spam Spam
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   381
  +Spam Spam Spam Spam Spam Spam Spam Spam Spam
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   382
   Whizzo butter
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   383
   Albatross
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   384
   Rat (rather a lot)
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   385
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   386
To make sure I do not push unready changeset by mistake I set the "bathroom
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   387
stuff" changeset in the secret phase.
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   388
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   389
  $ hg phase --force --secret 8d39a843582d
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   390
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   391
we can now push our change:
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   392
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   393
  $ hg push remote
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   394
  pushing to $TESTTMP/remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   395
  searching for changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   396
  adding changesets
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   397
  adding manifests
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   398
  adding file changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   399
  added 3 changesets with 3 changes to 1 files
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   400
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   401
for simplicity shake we get the bathroom change in line again
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   402
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   403
  $ hg rebase -Dr 8d39a843582d -d a2fccc2e7b08
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   404
  merging shopping
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   405
  $ hg phase --draft .
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   406
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   407
  @  8a79ae8b029e (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   408
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   409
  o  a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   410
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   411
  o  387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   412
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   413
  o  dfd3a2d7691e (public): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   414
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   415
  o  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   416
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   417
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   418
  
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   419
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   420
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   421
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   422
Splitting change
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   423
------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   424
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   425
To be done (currently achieve with "two commit + debugobsolete")
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   426
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   427
Collapsing change
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   428
------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   429
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   430
To be done (currently achieve with "revert + debugobsolete" or "rebase --collapse")
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   431
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   432
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   433
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   434
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   435
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   436
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   437
-----------------------
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   438
Collaboration
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   439
-----------------------
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   440
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   441
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   442
sharing mutable changeset
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   443
----------------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   444
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   445
To share mutable changeset with other just check that the repo you interact
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   446
with is "not publishing". Otherwise you will get the previously observe
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   447
behavior where exchanged changeset are automatically published.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   448
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   449
  $ cd ../remote
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   450
  $ hg -R ../local/ showconfig phases
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   451
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   452
the localrepo does not have any specific configuration for `phases.publish`. It
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   453
is ``true`` by default.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   454
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   455
  $ hg pull local
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   456
  pulling from $TESTTMP/local
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   457
  searching for changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   458
  adding changesets
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   459
  adding manifests
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   460
  adding file changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   461
  added 1 changesets with 1 changes to 1 files
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   462
  (run 'hg update' to get a working copy)
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   463
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   464
  o  8a79ae8b029e (public): bathroom stuff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   465
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   466
  o  a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   467
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   468
  o  387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   469
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   470
  o  dfd3a2d7691e (public): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   471
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   472
  @  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   473
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   474
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   475
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   476
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   477
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   478
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   479
We do not want to publish the "bathroom changeset". Let's rollback the last transaction
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   480
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   481
  $ hg rollback
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   482
  repository tip rolled back to revision 4 (undo pull)
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   483
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   484
  o  a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   485
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   486
  o  387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   487
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   488
  o  dfd3a2d7691e (public): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   489
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   490
  @  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   491
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   492
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   493
  
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   494
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   495
Let's make the local repo "non publishing"
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   496
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   497
  $ echo "[phases]\npublish=false" >> ../local/.hg/hgrc
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   498
  $ echo "[phases]\npublish=false" >> .hg/hgrc
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   499
  $ hg showconfig phases
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   500
  phases.publish=false
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   501
  $ hg -R ../local/ showconfig phases
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   502
  phases.publish=false
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   503
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   504
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   505
I can now exchange mutable changeset between "remote" and "local" repository.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   506
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   507
  $ hg pull local
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   508
  pulling from $TESTTMP/local
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   509
  searching for changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   510
  adding changesets
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   511
  adding manifests
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   512
  adding file changes
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   513
  added 1 changesets with 1 changes to 1 files
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   514
  (run 'hg update' to get a working copy)
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   515
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   516
  o  8a79ae8b029e (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   517
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   518
  o  a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   519
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   520
  o  387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   521
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   522
  o  dfd3a2d7691e (public): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   523
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   524
  @  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   525
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   526
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   527
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   528
211
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 209
diff changeset
   529
Rebasing unstable change after pull
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   530
----------------------------------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   531
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   532
Remotely someone add a new changeset on top of the mutable "bathroom" on.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   533
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   534
  $ hg up 8a79ae8b029e -q
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   535
  $ cat >> shopping << EOF
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   536
  > Giraffe
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   537
  > Rhino
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   538
  > Lion
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   539
  > Bear
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   540
  > EOF
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   541
  $ hg ci -m 'animals'
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   542
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   543
But at the same time, locally, this same "bathroom changeset" was updated.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   544
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   545
  $ cd ../local
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   546
  $ hg up 8a79ae8b029e -q
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   547
  $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   548
  $ hg amend
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   549
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   550
  @  ffa278c50818 (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   551
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   552
  o  a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   553
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   554
  o  387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   555
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   556
  o  dfd3a2d7691e (public): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   557
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   558
  o  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   559
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   560
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   561
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   562
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   563
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   564
When we pull from remote again we get an unstable state!
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   565
211
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 209
diff changeset
   566
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   567
  $ hg pull remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   568
  pulling from $TESTTMP/remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   569
  searching for changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   570
  adding changesets
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   571
  adding manifests
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   572
  adding file changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   573
  added 1 changesets with 1 changes to 1 files (+1 heads)
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   574
  (run 'hg heads .' to see heads, 'hg merge' to merge)
211
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 209
diff changeset
   575
  1 new unstables changesets
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   576
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   577
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   578
The new changeset "animal" is based one an old changeset of "bathroom". You can
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   579
see both version showing up in the log.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   580
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   581
  $ hg log -G
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 211
diff changeset
   582
  o  9ac5d0e790a2 (draft): animals
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   583
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   584
  | @  ffa278c50818 (draft): bathroom stuff
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   585
  | |
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 211
diff changeset
   586
  o |  8a79ae8b029e (draft): bathroom stuff
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   587
  |/
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   588
  o  a2fccc2e7b08 (public): SPAM SPAM
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   589
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   590
  o  387187ad9bd9 (public): adding fruit
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   591
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   592
  o  dfd3a2d7691e (public): adding condiment
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   593
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   594
  o  9ca060c80d74 (public): SPAM
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   595
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   596
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   597
  
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   598
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   599
The older version 8a79ae8b029e never ceased to exist in the local repo. It was
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   600
jsut hidden and excluded from pull and push.
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   601
236
5236927419bf [doc] fix tutorial warning
Pierre-Yves.David@ens-lyon.org
parents: 229
diff changeset
   602
.. note:: In hgview there is a nice doted relation highlighting ffa278c50818 as a new version of 8a79ae8b029e. this is not yet ported to graphlog.
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   603
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   604
Their is **unstable** changeset in this history now. Mercurial will refuse to
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   605
share it with the outside:
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   606
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   607
  $ hg push other
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   608
  pushing to $TESTTMP/other
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   609
  searching for changes
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   610
  abort: Trying to push unstable changeset: 9ac5d0e790a2!
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   611
  (use 'hg stabilize' to get a stable history (or --force to proceed))
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   612
  [255]
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   613
 
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   614
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   615
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   616
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   617
To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   618
ffa278c50818 the "hg stabilize" command will make this for you.
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   619
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   620
It has a --dry-run option to only suggest the next move.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   621
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   622
  $ hg stabilize --dry-run
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   623
  move:[15] animals
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   624
  atop:[14] bathroom stuff
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   625
  hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   626
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   627
Let's do it
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   628
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   629
  $ hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   630
  merging shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   631
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   632
The old version of bathroom is hidden again.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   633
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   634
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   635
  @  437efbcaf700 (draft): animals
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   636
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   637
  o  ffa278c50818 (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   638
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   639
  o  a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   640
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   641
  o  387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   642
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   643
  o  dfd3a2d7691e (public): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   644
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   645
  o  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   646
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   647
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   648
  
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   649
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   650
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   651
We can push this evolution to remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   652
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   653
  $ hg push remote
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   654
  pushing to $TESTTMP/remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   655
  searching for changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   656
  adding changesets
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   657
  adding manifests
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   658
  adding file changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   659
  added 2 changesets with 2 changes to 1 files (+1 heads)
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   660
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   661
remote get a warning that current working directory is based on an obsolete changeset
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   662
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   663
  $ cd ../remote
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   664
  $ hg pull local # we up again to trigger the warning. it was displayed during the push
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   665
  pulling from $TESTTMP/local
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   666
  searching for changes
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   667
  no changes found
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   668
  Working directory parent is obsolete
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   669
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   670
  $ hg up 437efbcaf700
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   671
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   672
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   673
Relocating unstable change after kill
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   674
----------------------------------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   675
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   676
The remote guy keep working
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   677
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   678
  $ sed -i'' -e 's/Spam/Spam Spam Spam Spam/g' shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   679
  $ hg commit -m "SPAM SPAM SPAM"
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   680
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   681
I'm pulling its work locally.
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   682
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   683
  $ cd ../local
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   684
  $ hg pull remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   685
  pulling from $TESTTMP/remote
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   686
  searching for changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   687
  adding changesets
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   688
  adding manifests
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   689
  adding file changes
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   690
  added 1 changesets with 1 changes to 1 files
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   691
  (run 'hg update' to get a working copy)
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   692
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   693
  o  ae45c0c3092a (draft): SPAM SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   694
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   695
  @  437efbcaf700 (draft): animals
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   696
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   697
  o  ffa278c50818 (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   698
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   699
  o  a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   700
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   701
  o  387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   702
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   703
  o  dfd3a2d7691e (public): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   704
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   705
  o  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   706
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   707
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   708
  
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   709
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   710
In the mean time I noticed you can't buy animals in a super market and I kill the animal changeset:
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   711
211
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 209
diff changeset
   712
  $ hg kill 437efbcaf700
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   713
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   714
  working directory now at ffa278c50818
211
69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 209
diff changeset
   715
  1 new unstables changesets
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   716
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   717
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   718
The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   719
is neither dead or obsolete.  My repository is in an unstable state again.
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   720
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   721
  $ hg log -G
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 211
diff changeset
   722
  o  ae45c0c3092a (draft): SPAM SPAM SPAM
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   723
  |
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 211
diff changeset
   724
  o  437efbcaf700 (draft): animals
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   725
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   726
  @  ffa278c50818 (draft): bathroom stuff
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   727
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   728
  o  a2fccc2e7b08 (public): SPAM SPAM
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   729
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   730
  o  387187ad9bd9 (public): adding fruit
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   731
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   732
  o  dfd3a2d7691e (public): adding condiment
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   733
  |
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   734
  o  9ca060c80d74 (public): SPAM
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   735
  |
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   736
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   737
  
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   738
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   739
  $ hg log -r 'unstable()'
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   740
  ae45c0c3092a (draft): SPAM SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   741
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   742
# XXX make kill stabilization works
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   743
#  $ hg stabilize --any
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   744
#  merging shopping
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   745
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   746
  $ hg graft -O ae45c0c3092a
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   747
  grafting revision 17
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   748
  merging shopping
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   749
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   750
  $ hg log -G
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   751
  @  20de1fb1cec5 (draft): SPAM SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   752
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   753
  o  ffa278c50818 (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   754
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   755
  o  a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   756
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   757
  o  387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   758
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   759
  o  dfd3a2d7691e (public): adding condiment
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   760
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   761
  o  9ca060c80d74 (public): SPAM
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   762
  |
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   763
  o  7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   764
  
209
7bee48a54c4a tutorial: make it pass again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 163
diff changeset
   765
163
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   766
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   767
Handling Conflicting amend
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   768
----------------------------------------------
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   769
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   770
We can detect that multiple diverging//conflicting amend have been made. There
92b073d13f2d more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
   771
will be a "evol-merge" command to merge conflicting amend
229
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   772
681e25e5d83a [doc] update tutorial text.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 228
diff changeset
   773
This command is not ready yet.