--- a/docs/tutorials/tutorial.t Mon Apr 23 18:53:26 2012 +0200
+++ b/docs/tutorials/tutorial.t Mon Apr 23 18:54:17 2012 +0200
@@ -453,7 +453,7 @@
9ca060c80d74 (public): SPAM
7e82d3f3c2cb (public): Monthy Python Shopping list
-Rebasing unstable change after update
+Rebasing unstable change after pull
----------------------------------------------
Remotely someone add a new changeset on top of our mutable "bathroom" on.
@@ -484,6 +484,7 @@
When we pull from remote again we get an unstable state!
+
$ hg pull remote
pulling from $TESTTMP/remote
searching for changes
@@ -492,6 +493,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads .' to see heads, 'hg merge' to merge)
+ 1 new unstables changesets
$ hg log
9ac5d0e790a2 (secret): animals
ffa278c50818 (draft): bathroom stuff
@@ -611,9 +613,10 @@
In the mean time I noticed you can't buy animals in a super market and I kill the animal changeset:
- $ hg kill 437efbcaf700 # XXX issue a warning here
+ $ hg kill 437efbcaf700
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory now at ffa278c50818
+ 1 new unstables changesets
The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset