# HG changeset patch # User timeless # Date 1451509542 0 # Node ID fa8c491f2deb53bcbbe93d65f69f4544c5a5c764 # Parent b8405d739149cdd6d8d9bd5e3dd2ad8487b1f09a import: limit scope of msg in tryimportone diff -r b8405d739149 -r fa8c491f2deb mercurial/cmdutil.py --- a/mercurial/cmdutil.py Sat Jan 02 02:13:56 2016 +0100 +++ b/mercurial/cmdutil.py Wed Dec 30 21:05:42 2015 +0000 @@ -883,7 +883,6 @@ sim = float(opts.get('similarity') or 0) if not tmpname: return (None, None, False) - msg = _('applied to working directory') rejects = False @@ -1009,6 +1008,7 @@ ui.warn(_("warning: can't check exact import with --no-commit\n")) elif opts.get('exact') and hex(n) != nodeid: raise error.Abort(_('patch is damaged or loses information')) + msg = _('applied to working directory') if n: # i18n: refers to a short changeset id msg = _('created %s') % short(n)