Commits

Pierre-Yves David committed e763f7e

tutorial: glog is into core now

Comments (0)

Files changed (1)

tests/test-tutorial.t

   > # "-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
   $ 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
 
 This history is very linear
 
-  $ hg glog
+  $ hg log -G
   @  d85de4546133 (draft): adding fruit
   |
   o  4d5dc8187023 (draft): adding condiment
 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
   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
 
 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
   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
 
 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]
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.