[Python-checkins] devguide: Mention using 'patch' for svn patches.

[brett.cannon]

brett.cannon pushed 46e28043b931 to devguide:

http://hg.python.org/devguide/rev/46e28043b931
changeset:   292:46e28043b931
branch:      hg_transition
tag:         tip
user:        Brett Cannon <brett at python.org>
date:        Wed Feb 09 15:02:20 2011 -0800
summary:
  Mention using 'patch' for svn patches.

files:
  patch.rst

diff --git a/patch.rst b/patch.rst
--- a/patch.rst
+++ b/patch.rst
@@ -136,14 +136,27 @@
 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.
 
+If a 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::
+
+   patch -p0 < mywork.patch
+
 To undo a patch imported into your working copy, simply delete the patch from
-your patch queue::
+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 qdelete mywork.patch
+   hg qdelete mywork.patch
 
 Please refer to the :ref:`FAQ <faq>` for :ref:`more information
 <hg-local-workflow>` on how to manage your local changes.
 
+.. 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.
+
+
 
 Submitting
 ----------

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