[Python-checkins] devguide (hg_transition): Refine the FAQ entry about hg qimport

[antoine.pitrou]

antoine.pitrou pushed d1402dfa33ac to devguide:

http://hg.python.org/devguide/rev/d1402dfa33ac
changeset:   309:d1402dfa33ac
branch:      hg_transition
tag:         tip
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Mon Feb 14 18:33:46 2011 +0100
summary:
  Refine the FAQ entry about hg qimport

files:
  faq.rst

diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -192,24 +192,27 @@
 If the patch was not created by hg (i.e., a patch created by SVN and thus lacking
 any ``a``/``b`` directory prefixes in the patch), use ``-p0`` instead of ``-p1``.
 
+.. note:: The ``patch`` program is not available by default under Windows.
+   You can find it `here <http://gnuwin32.sourceforge.net/packages/patch.htm>`_,
+   courtesy of the `GnuWin32 <http://gnuwin32.sourceforge.net/>`_ project.
+   Also, you may find it necessary to add the "``--binary``" option when trying
+   to apply Unix-generated patches under Windows.
+
+
 If you want to work on the patch using mq_ (Mercurial Queues), type instead::
 
    hg qimport somework.patch
 
 This will create a patch in your queue with a name that matches the filename.
-You can use the ``-n`` argument to specify a different name.
+You can use the ``-n`` argument to specify a different name.  To have the
+patch applied to the working copy, type::
 
-To undo a patch imported into your working copy, simply delete the patch from
-your patch queue. You do need to make sure it is not applied (``hg qtop`` will
-tell you that while ``hg qpop`` will un-apply the top-most patch)::
+   hg qpush
 
-   hg qdelete mywork.patch
+Finally, to delete the patch, first un-apply it if necessary using ``hg qpop``,
+then do::
 
-.. note:: The ``patch`` program is not available by default under Windows.
-   You can find it `here <http://gnuwin32.sourceforge.net/packages/patch.htm>`_,
-   courtesy of the `GnuWin32 <http://gnuwin32.sourceforge.net/>`_ project.
-   Also, you may find it necessary to add the "``--binary``" option when trying
-   to apply Unix-generated patches under Windows.
+   hg qdelete somework.patch
 
 .. _mq: http://mercurial.selenic.com/wiki/MqExtension
 

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