Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/patch.py @ 4434:439b1c35348a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue483 - mq does not work under windows with gnu-win32 patch. Add --binary option to patch command under win32.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 12 May 2007 21:09:29 +0200
parents aa26759c6fb3
children aac150af09e8
line wrap: on
line diff
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -296,6 +296,9 @@ def patch(patchname, ui, strip=1, cwd=No
         patcher = util.find_in_path('gpatch', os.environ.get('PATH', ''),
                                     'patch')
         args = []
+        if util.needbinarypatch():
+            args.append('--binary')
+                                    
         if cwd:
             args.append('-d %s' % util.shellquote(cwd))
         fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,