[Python-checkins] devguide (hg_transition): Mention the collapse extension, simpler than MQ

[eric.araujo]

eric.araujo pushed 20beef07677f to devguide:

http://hg.python.org/devguide/rev/20beef07677f
changeset:   330:20beef07677f
branch:      hg_transition
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Feb 26 17:29:31 2011 +0100
summary:
  Mention the collapse extension, simpler than MQ

files:
  committing.rst

diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -44,7 +44,8 @@
   the result to the main repository.  The reason is that we don't want the
   history to be full of intermediate commits recording the private history
   of the person working on a patch.  If you are using the rebase_ extension,
-  consider adding the ``--collapse`` option to ``hg rebase``.
+  consider adding the ``--collapse`` option to ``hg rebase``.  The collapse_
+  extension is another choice.
 
 Because of these constraints, it can be practical to use other approaches
 such as mq_ (Mercurial Queues), in order to maintain patches in a single
@@ -54,6 +55,7 @@
 .. _Mercurial: http://www.hg-scm.org/
 .. _mq: http://mercurial.selenic.com/wiki/MqExtension
 .. _rebase: http://mercurial.selenic.com/wiki/RebaseExtension
+.. _collapse: http://mercurial.selenic.com/wiki/CollapseExtension
 
 
 Handling Other's Code

--
Repository URL: http://hg.python.org/devguide