Mercurial > evolve
changeset 634:e763f7e94211 stable
tutorial: glog is into core now
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 02 Jan 2013 11:49:22 +0100 |
| parents | 87269fca586b |
| children | 0f5ff3b36144 |
| files | tests/test-tutorial.t |
| diffstat | 1 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-tutorial.t Mon Dec 03 16:30:25 2012 +0100 +++ b/tests/test-tutorial.t Wed Jan 02 11:49:22 2013 +0100 @@ -14,8 +14,6 @@ > # "-d '0 0'" means that the new commit will be at January 1st 1970. > # This is used for stable hash during test > amend = amend -d '0 0' - > [extensions] - > hgext.graphlog= > EOF $ hg init local @@ -55,10 +53,6 @@ $ hg showconfig diff diff.git=1 -And the graphlog extension - $ hg showconfig extensions - extensions.hgext.graphlog= - And of course, we enable the experimental extensions for mutable history: $ cat >> $HGRCPATH <<EOF @@ -120,7 +114,7 @@ This history is very linear - $ hg glog + $ hg log -G @ d85de4546133 (draft): adding fruit | o 4d5dc8187023 (draft): adding condiment @@ -153,7 +147,7 @@ the outside. The first one have been exchanged and is an immutable public changeset. - $ hg glog + $ hg log -G @ d85de4546133 (draft): adding fruit | o 4d5dc8187023 (draft): adding condiment @@ -161,7 +155,7 @@ o 7e82d3f3c2cb (public): Monthy Python Shopping list -hopefully. I can use hg amend to rewrite my faulty changeset! +hopefully. I can use `hg commit --amend` to rewrite my faulty changeset! $ sed -i'' -e s/Bananos/Banana/ shopping $ hg diff @@ -180,7 +174,7 @@ A new changeset with the right diff replace the wrong one. - $ hg glog + $ hg log -G @ 0cacb48f4482 (draft): adding fruit | o 4d5dc8187023 (draft): adding condiment @@ -335,7 +329,7 @@ o 7e82d3f3c2cb (public): Monthy Python Shopping list -.. note: don't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable. +.. note: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable. I now want to push to remote all my change but the bathroom one that i'm not totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" not children of @@ -364,7 +358,7 @@ We have a new SPAM SPAM version without the bathroom stuff - $ grep Spam shopping # enouth spam + $ grep Spam shopping # enough spam Spam Spam Spam Spam Spam Spam Spam Spam Spam $ grep Toothbrush shopping # no Toothbrush [1]