mercurial-scm/evolve: docs/tutorials/tutorial.t annotate

annotate docs/tutorials/tutorial.t @ 236:5236927419bf

[doc] fix tutorial warning

author	Pierre-Yves.David@ens-lyon.org
date	Wed, 09 May 2012 23:00:00 +0200
parents	681e25e5d83a
children	5e47d361206a

rev	line source
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
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	3 ---------------------
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	4 .. Various setup
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	5
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	6 $ cat >> $HGRCPATH << EOF
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	7 > [ui]
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	8 > logtemplate ="{node\|short} ({phase}): {desc}\n"
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	9 > [diff]
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	10 > git = 1
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	11 > [alias]
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	12 > amend = amend -d '0 0'
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	13 > [extensions]
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	14 > hgext.graphlog=
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	15 > EOF
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	16
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	17 $ hg init local
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	18 $ cat >> local/.hg/hgrc << EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	19 > [paths]
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	20 > remote = ../remote
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	21 > other = ../other
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	22 > [ui]
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	23 > user = Babar the King
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	24 > EOF
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	25
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	26 $ hg init remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	27 $ cat >> remote/.hg/hgrc << EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	28 > [paths]
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	29 > local = ../local
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	30 > [ui]
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	31 > user = Celestine the Queen
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	32 > EOF
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	33
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	34 $ hg init other
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	35 $ cat >> other/.hg/hgrc << EOF
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	36 > [ui]
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	37 > user = Princess Flore
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	38 > EOF
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	39
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	40
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	41 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	42
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	43 A compact log template with phase data:
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 $ hg showconfig ui
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	46 ui.slash=True
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	47 ui.logtemplate="{node\|short} ({phase}): {desc}\n"
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 Improved git format diff:
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	50
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	51 $ hg showconfig diff
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	52 diff.git=1
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	53
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	54 And the graphlog extension
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	55 $ hg showconfig extensions
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	56 extensions.hgext.graphlog=
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	57
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	58 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	59
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	60 $ $(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	61
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	62
229 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 Single Developer Usage
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	65 -----------------------
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	66
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	67 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	68
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	69
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	70 Fixing mistake with `hg amend`
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	71 --------------------------------
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	72
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	73 We are versionning a shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	74
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	75 $ cd local
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	76 $ cat >> shopping << EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	77 > Spam
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	78 > Whizzo butter
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	79 > Albatross
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	80 > Rat (rather a lot)
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	81 > Jugged fish
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	82 > Blancmange
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	83 > Salmon mousse
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	84 > EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	85 $ hg commit -A -m "Monthy Python Shopping list"
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	86 adding shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	87
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	88 Its first version is shared with the outside.
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	89
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	90 $ hg push remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	91 pushing to $TESTTMP/remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	92 searching for changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	93 adding changesets
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	94 adding manifests
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	95 adding file changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	96 added 1 changesets with 1 changes to 1 files
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	97
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	98 Later I add additional item to my list
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	99
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	100 $ cat >> shopping << EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	101 > Egg
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	102 > Suggar
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	103 > Vinegar
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	104 > Oil
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	105 > EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	106 $ hg commit -m "adding condiment"
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	107 $ cat >> shopping << EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	108 > Bananos
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	109 > Pear
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	110 > Apple
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	111 > EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	112 $ hg commit -m "adding fruit"
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	113
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	114 This history is very linear
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	115
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	116 $ hg glog
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	117 @ d85de4546133 (draft): adding fruit
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	118 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	119 o 4d5dc8187023 (draft): adding condiment
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	120 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	121 o 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	122
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	123
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	124 But a typo was made in Babanas!
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	125
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	126 $ hg export tip
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	127 # HG changeset patch
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	128 # User test
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	129 # Date 0 0
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	130 # Node ID d85de4546133030c82d257bbcdd9b1b416d0c31c
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	131 # Parent 4d5dc81870237d492284826e21840b2ca00e26d1
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	132 adding fruit
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	133
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	134 diff --git a/shopping b/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	135 --- a/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	136 +++ b/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	137 @@ -9,3 +9,6 @@
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	138 Suggar
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	139 Vinegar
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	140 Oil
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	141 +Bananos
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	142 +Pear
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	143 +Apple
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	144
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	145 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	146 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	147 changeset.
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	148
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	149 $ hg glog
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	150 @ d85de4546133 (draft): adding fruit
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	151 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	152 o 4d5dc8187023 (draft): adding condiment
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	153 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	154 o 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	155
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	156
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	157 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	158
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	159 $ sed -i'' -e s/Bananos/Banana/ shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	160 $ hg diff
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	161 diff --git a/shopping b/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	162 --- a/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	163 +++ b/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	164 @@ -9,6 +9,6 @@
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	165 Suggar
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	166 Vinegar
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	167 Oil
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	168 -Bananos
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	169 +Banana
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	170 Pear
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	171 Apple
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	172 $ hg amend
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	173
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	174 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	175
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	176 $ hg glog
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	177 @ 0cacb48f4482 (draft): adding fruit
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	178 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	179 o 4d5dc8187023 (draft): adding condiment
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	180 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	181 o 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	182
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	183 $ hg export tip
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	184 # HG changeset patch
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	185 # User test
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	186 # Date 0 0
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	187 # Node ID 0cacb48f44828d2fd31c4e45e18fde32a5b2f07b
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	188 # Parent 4d5dc81870237d492284826e21840b2ca00e26d1
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	189 adding fruit
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	190
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	191 diff --git a/shopping b/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	192 --- a/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	193 +++ b/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	194 @@ -9,3 +9,6 @@
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	195 Suggar
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	196 Vinegar
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	197 Oil
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	198 +Banana
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	199 +Pear
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	200 +Apple
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	201
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	202 Getting Ride of branchy history
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	203 ----------------------------------
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	204
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	205 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	206
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	207 $ cd ../remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	208 $ hg up -q
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	209 $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	210 $ hg ci -m 'SPAM'
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	211 $ cd ../local
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	212
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	213 I'll get this remote changeset when pulling
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	214
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	215 $ hg pull remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	216 pulling from $TESTTMP/remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	217 searching for changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	218 adding changesets
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	219 adding manifests
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	220 adding file changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	221 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	222 (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	223
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	224 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	225
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	226 $ hg log -G
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	227 o 9ca060c80d74 (public): SPAM
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	228 \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	229 \| @ 0cacb48f4482 (draft): adding fruit
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	230 \| \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	231 \| o 4d5dc8187023 (draft): adding condiment
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 o 7e82d3f3c2cb (public): Monthy Python Shopping list
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	234
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	235
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	236 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	237
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	238 $ hg diff
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	239 $ hg rebase -d 9ca060c80d74 -s 4d5dc8187023
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	240 merging shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	241 merging shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	242
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	243
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	244 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	245
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	246 $ hg log -G
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	247 @ 387187ad9bd9 (draft): adding fruit
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	248 \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	249 o dfd3a2d7691e (draft): adding condiment
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	250 \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	251 o 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	254
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	255
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	256 Removing changeset
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	257 ------------------------
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 I add new item to my list
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	260
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	261 $ cat >> shopping << EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	262 > car
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	263 > bus
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	264 > plane
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	265 > boat
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	266 > EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	267 $ hg ci -m 'transport'
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	268 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	269 @ d58c77aa15d7 (draft): transport
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	270 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	271 o 387187ad9bd9 (draft): adding fruit
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	272 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	273 o dfd3a2d7691e (draft): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	278
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	279
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	280 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	281 not fit well in my standard shopping list)
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	282
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	283 $ hg kill . # . is for working directory parent
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	284 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	285 working directory now at 387187ad9bd9
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	286
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	287 The silly changeset is gone.
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	288
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	289 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	290 @ 387187ad9bd9 (draft): adding fruit
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	291 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	292 o dfd3a2d7691e (draft): adding condiment
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	293 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	294 o 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	297
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	298
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	299 Reordering changeset
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	300 ------------------------
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	301
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	302
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	303 We create two changesets.
163 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 $ cat >> shopping << EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	307 > Shampoo
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	308 > Toothbrush
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	309 > ... More bathroom stuff to come
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	310 > Towel
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	311 > Soap
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	312 > EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	313 $ 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	314
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	315 $ 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	316 $ hg ci -m 'SPAM SPAM'
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	317 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	318 @ c48f32fb1787 (draft): SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	319 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	320 o 8d39a843582d (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	321 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	322 o 387187ad9bd9 (draft): adding fruit
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 dfd3a2d7691e (draft): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	329
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	330
236 5236927419bf [doc] fix tutorial warning Pierre-Yves.David@ens-lyon.org parents: 229 diff changeset	331 .. 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	332
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	333 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	334 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	335 "bathroom stuff"
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	336
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	337 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	338
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	339 $ 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	340 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	341 $ 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	342 grafting revision 10
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	343 merging shopping
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	344 $ hg log -G
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	345 @ a2fccc2e7b08 (draft): SPAM SPAM
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	346 \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	347 \| o 8d39a843582d (draft): bathroom stuff
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	348 \|/
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	349 o 387187ad9bd9 (draft): adding fruit
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 dfd3a2d7691e (draft): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	356
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	357
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	358 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	359
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	360 $ grep Spam shopping # enouth spam
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	361 Spam Spam Spam Spam Spam Spam Spam Spam Spam
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	362 $ grep Toothbrush shopping # no Toothbrush
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	363 [1]
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	364 $ hg export .
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	365 # HG changeset patch
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	366 # User test
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	367 # Date 0 0
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	368 # Node ID a2fccc2e7b08bbce6af7255b989453f7089e4cf0
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	369 # Parent 387187ad9bd9d8f9a00a9fa804a26231db547429
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	370 SPAM SPAM
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	371
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	372 diff --git a/shopping b/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	373 --- a/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	374 +++ b/shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	375 @@ -1,4 +1,4 @@
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	376 -Spam Spam Spam
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	377 +Spam Spam Spam Spam Spam Spam Spam Spam Spam
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	378 Whizzo butter
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	379 Albatross
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	380 Rat (rather a lot)
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	381
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	382 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	383 stuff" changeset in the secret phase.
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	384
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	385 $ hg phase --force --secret 8d39a843582d
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	386
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	387 we can now push our change:
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	388
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	389 $ hg push remote
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	390 pushing to $TESTTMP/remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	391 searching for changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	392 adding changesets
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	393 adding manifests
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	394 adding file changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	395 added 3 changesets with 3 changes to 1 files
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	396
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	397 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	398
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	399 $ hg rebase -Dr 8d39a843582d -d a2fccc2e7b08
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	400 merging shopping
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	401 $ hg phase --draft .
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	402 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	403 @ 8a79ae8b029e (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	404 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	405 o a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	406 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	407 o 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
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
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	416
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	417
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	418 Splitting change
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	419 ------------------
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 To be done (currently achieve with "two commit + debugobsolete")
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	422
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	423 Collapsing change
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
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	426 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	427
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	428
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	429
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	430
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	431
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 Collaboration
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	435 -----------------------
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	436
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	437
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	438 sharing mutable changeset
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	439 ----------------------------
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	440
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	441 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	442 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	443 behavior where exchanged changeset are automatically published.
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	444
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	445 $ cd ../remote
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	446 $ hg -R ../local/ showconfig phases
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	447
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	448 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	449 is ``true`` by default.
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	450
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	451 $ hg pull local
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	452 pulling from $TESTTMP/local
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	453 searching for changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	454 adding changesets
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	455 adding manifests
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	456 adding file changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	457 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	458 (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	459 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	460 o 8a79ae8b029e (public): bathroom stuff
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	461 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	462 o a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	463 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	464 o 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 @ 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	471
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	472
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	473
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	474
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	475 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	476
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	477 $ hg rollback
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	478 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	479 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	480 o a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	481 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	482 o 387187ad9bd9 (public): adding fruit
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	483 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	484 o dfd3a2d7691e (public): adding condiment
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 @ 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	489
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	490
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	491 Let's make the local repo "non publishing"
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	492
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	493 $ 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	494 $ echo "[phases]\npublish=false" >> .hg/hgrc
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	495 $ hg showconfig phases
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	496 phases.publish=false
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	497 $ hg -R ../local/ showconfig phases
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	498 phases.publish=false
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	499
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	500
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	501 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	502
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	503 $ hg pull local
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	504 pulling from $TESTTMP/local
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	505 searching for changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	506 adding changesets
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	507 adding manifests
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	508 adding file changes
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	509 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	510 (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	511 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	512 o 8a79ae8b029e (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	513 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	514 o a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	515 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	516 o 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 @ 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	523
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	524
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 209 diff changeset	525 Rebasing unstable change after pull
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	526 ----------------------------------------------
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	527
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	528 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	529
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	530 $ hg up 8a79ae8b029e -q
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	531 $ cat >> shopping << EOF
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	532 > Giraffe
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	533 > Rhino
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	534 > Lion
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	535 > Bear
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	536 > EOF
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	537 $ hg ci -m 'animals'
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	538
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	539 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	540
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	541 $ cd ../local
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	542 $ hg up 8a79ae8b029e -q
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	543 $ 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	544 $ hg amend
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	545 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	546 @ ffa278c50818 (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	547 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	548 o a2fccc2e7b08 (public): SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	549 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	550 o 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	557
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	558
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	559
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	560 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	561
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 209 diff changeset	562
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	563 $ hg pull remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	564 pulling from $TESTTMP/remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	565 searching for changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	566 adding changesets
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	567 adding manifests
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	568 adding file changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	569 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	570 (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	571 1 new unstables changesets
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	572
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	573
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	574 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	575 see both version showing up in the log.
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	576
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	577 $ 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	578 o 9ac5d0e790a2 (draft): animals
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	579 \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	580 \| @ ffa278c50818 (draft): bathroom stuff
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	581 \| \|
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	582 o \| 8a79ae8b029e (draft): bathroom stuff
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 o a2fccc2e7b08 (public): SPAM SPAM
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	585 \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	586 o 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	593
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	594
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	595 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	596 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	597
236 5236927419bf [doc] fix tutorial warning Pierre-Yves.David@ens-lyon.org parents: 229 diff changeset	598 .. 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	599
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	600 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	601 share it with the outside:
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	602
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	603 $ hg push other
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	604 pushing to $TESTTMP/other
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	605 searching for changes
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	606 abort: Trying to push unstable changeset: 9ac5d0e790a2!
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	607 (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	608 [255]
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	609
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	610
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	611
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	612
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	613 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	614 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	615
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	616 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	617
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	618 $ hg stabilize --dry-run
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	619 move:[15] animals
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	620 atop:[14] bathroom stuff
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	621 hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	622
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	623 Let's do it
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	624
209 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
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	626 merging shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	627
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	628 The old version of bathroom is hidden again.
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	629
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	630 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	631 @ 437efbcaf700 (draft): animals
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	632 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	633 o ffa278c50818 (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	634 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	635 o a2fccc2e7b08 (public): SPAM SPAM
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 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	644
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	645
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	646
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	647 We can push this evolution to remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	648
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	649 $ hg push remote
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	650 pushing to $TESTTMP/remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	651 searching for changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	652 adding changesets
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	653 adding manifests
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	654 adding file changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	655 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	656
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	657 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	658
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	659 $ cd ../remote
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	660 $ 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	661 pulling from $TESTTMP/local
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	662 searching for changes
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	663 no changes found
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	664 Working directory parent is obsolete
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	665
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	666 $ hg up 437efbcaf700
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	667 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	668
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	669 Relocating unstable change after kill
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	670 ----------------------------------------------
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	671
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	672 The remote guy keep working
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	673
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	674 $ 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	675 $ hg commit -m "SPAM SPAM SPAM"
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	676
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	677 I'm pulling its work locally.
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	678
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	679 $ cd ../local
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	680 $ hg pull remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	681 pulling from $TESTTMP/remote
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	682 searching for changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	683 adding changesets
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	684 adding manifests
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	685 adding file changes
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	686 added 1 changesets with 1 changes to 1 files
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	687 (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	688 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	689 o ae45c0c3092a (draft): SPAM SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	690 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	691 @ 437efbcaf700 (draft): animals
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	692 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	693 o ffa278c50818 (draft): bathroom stuff
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 o a2fccc2e7b08 (public): SPAM SPAM
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 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	704
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	705
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	706 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	707
211 69a37d56c7fb evolve: issue the "%i new unstable changeset" in more place Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 209 diff changeset	708 $ hg kill 437efbcaf700
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	709 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	710 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	711 1 new unstables changesets
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	712
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	713
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	714 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	715 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	716
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	717 $ 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	718 o ae45c0c3092a (draft): SPAM SPAM SPAM
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	719 \|
217 786eb34d93ea obsolete: refuse to push unstable changeset without -f Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 211 diff changeset	720 o 437efbcaf700 (draft): animals
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	721 \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	722 @ ffa278c50818 (draft): bathroom stuff
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	723 \|
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	724 o a2fccc2e7b08 (public): SPAM SPAM
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 o 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 9ca060c80d74 (public): SPAM
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	731 \|
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	732 o 7e82d3f3c2cb (public): Monthy Python Shopping list
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	733
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	734
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	735 $ hg log -r 'unstable()'
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	736 ae45c0c3092a (draft): SPAM SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	737
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	738 # XXX make kill stabilization works
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	739 # $ hg stabilize --any
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	740 # merging shopping
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	741
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	742 $ hg graft -O ae45c0c3092a
7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	743 grafting revision 17
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	744 merging shopping
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	745
229 681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	746 $ hg log -G
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	747 @ 20de1fb1cec5 (draft): SPAM SPAM SPAM
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	748 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	749 o ffa278c50818 (draft): bathroom stuff
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	750 \|
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	751 o a2fccc2e7b08 (public): 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 387187ad9bd9 (public): adding fruit
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 dfd3a2d7691e (public): adding condiment
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 9ca060c80d74 (public): SPAM
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 7e82d3f3c2cb (public): Monthy Python Shopping list
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	760
209 7bee48a54c4a tutorial: make it pass again Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 163 diff changeset	761
163 92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	762
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	763 Handling Conflicting amend
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	764 ----------------------------------------------
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	765
92b073d13f2d more doc update Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	766 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	767 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	768
681e25e5d83a [doc] update tutorial text. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 228 diff changeset	769 This command is not ready yet.

Mercurial > public > mercurial-scm > evolve

annotate docs/tutorials/tutorial.t @ 236:5236927419bf