Mercurial > hg

changeset 10751:440786f7f18b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: warn when the internal patcher fails hopefully we'll soon fix the remaining failures from the internal patcher, and not use the external one anymore.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 22 Mar 2010 11:08:42 +0100
parents 03225f14c495
children 53313405b54d
files mercurial/patch.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/patch.py	Sat Mar 20 16:57:24 2010 -0500
+++ b/mercurial/patch.py	Mon Mar 22 11:08:42 2010 +0100
@@ -1320,6 +1320,10 @@
             try:
                 return internalpatch(patchname, ui, strip, cwd, files, eolmode)
             except NoHunks:
+                ui.warn(_('internal patcher failed\n'
+                          'please report details to '
+                          'http://mercurial.selenic.com/bts/\n'
+                          'or mercurial@selenic.com\n'))
                 patcher = (util.find_exe('gpatch') or util.find_exe('patch')
                            or 'patch')
                 ui.debug('no valid hunks found; trying with %r instead\n' %