--- a/mercurial/commands.py Tue Nov 20 15:46:20 2007 -0600
+++ b/mercurial/commands.py Tue Nov 20 15:54:25 2007 -0600
@@ -1629,7 +1629,7 @@
if opts.get('exact'):
if hex(n) != nodeid:
repo.rollback()
- raise util.Abort(_('patch is damaged' +
+ raise util.Abort(_('patch is damaged'
' or loses information'))
finally:
os.unlink(tmpname)
@@ -1937,7 +1937,7 @@
if len(heads) == 1:
msg = _('there is nothing to merge')
if parent != repo.lookup(repo.workingctx().branch()):
- msg = _('%s - use "hg update" instead' % msg)
+ msg = _('%s - use "hg update" instead') % msg
raise util.Abort(msg)
if parent not in heads:
--- a/mercurial/dispatch.py Tue Nov 20 15:46:20 2007 -0600
+++ b/mercurial/dispatch.py Tue Nov 20 15:54:25 2007 -0600
@@ -125,7 +125,7 @@
ui.warn("\n%r\n" % util.ellipsis(inst[1]))
except ImportError, inst:
m = str(inst).split()[-1]
- ui.warn(_("abort: could not import module %s!\n" % m))
+ ui.warn(_("abort: could not import module %s!\n") % m)
if m in "mpatch bdiff".split():
ui.warn(_("(did you forget to compile extensions?)\n"))
elif m in "zlib".split():