diff -r 53d7e3413337 -r 5a0a01c4c7c2 docs/evolve-faq.rst --- a/docs/evolve-faq.rst Fri Aug 24 11:49:21 2012 +0200 +++ b/docs/evolve-faq.rst Thu Sep 20 23:14:59 2012 +0200 @@ -1,3 +1,5 @@ +.. Copyright 2011 Pierre-Yves David +.. Logilab SA --------------------------------------------------------------------- Evolve How To @@ -19,7 +21,7 @@ `public` changesets. To understand what the result of amend will be I use the two following -aliases [#]_:: +aliases [#]_:: # diff what amend will look likes pdiff=diff --rev .^ @@ -41,7 +43,7 @@ XXX add idank example -.. [#] (added by enable.sh) +.. [#] (defined by the evolve extension for you) @@ -88,10 +90,10 @@ .. note:: those command only exist for the convenience of getting qpush and qpop feeling back. -Collapse changesets: ``amend`` +Collapse changesets: ``fold`` ------------------------------------------------------------ -you can use amend -c to collapse multiple changeset in a single one. +you can use ``hg fold`` to collapse multiple changesets in a single one. Getting changes out of a commit ------------------------------------------------------------ @@ -152,7 +154,7 @@ .. warning:: Beware that rebasing obsolete changesets will result in conflicting versions of the changesets. -Stabilize history: ``evolve`` +Resolve history troubles: ``evolve`` ------------------------------------------------------------ When you rewrite (amend) a changeset with children without rewriting @@ -191,10 +193,14 @@ View obsolete markers ------------------------------------------------------------ -hgview is the only viewer that support this feature. You need an experimental -version available here: +hgview_ is the only viewer that currently supports this feature. You +need version 1.6.2 - $ hg clone http://hg-dev.octopoid.net/hgwebdir.cgi/hgview/ +.. _hgview: http://www.logilab.org/project/hgview/ + +.. image:: figures/hgview-example.png + :scale: 50% + You can also use a debug command