##// END OF EJS Templates
patch: warn when the internal patcher fails...
Benoit Boissinot -
r10751:440786f7 default
parent child Browse files
Show More
@@ -1320,6 +1320,10 b' def patch(patchname, ui, strip=1, cwd=No'
1320 try:
1320 try:
1321 return internalpatch(patchname, ui, strip, cwd, files, eolmode)
1321 return internalpatch(patchname, ui, strip, cwd, files, eolmode)
1322 except NoHunks:
1322 except NoHunks:
1323 ui.warn(_('internal patcher failed\n'
1324 'please report details to '
1325 'http://mercurial.selenic.com/bts/\n'
1326 'or mercurial@selenic.com\n'))
1323 patcher = (util.find_exe('gpatch') or util.find_exe('patch')
1327 patcher = (util.find_exe('gpatch') or util.find_exe('patch')
1324 or 'patch')
1328 or 'patch')
1325 ui.debug('no valid hunks found; trying with %r instead\n' %
1329 ui.debug('no valid hunks found; trying with %r instead\n' %
General Comments 0
You need to be logged in to leave comments. Login now