Patchwork [1,of,3,STABLE] merge: fix lack of "%s" in format string causing TypeError at runtime

login
register
mail settings
Submitter Katsunori FUJIWARA
Date March 31, 2014, 6:17 p.m.
Message ID <44df0fef692bcf343d9e.1396289852@feefifofum>
Download mbox | patch
Permalink /patch/4159/
State Accepted
Commit 539d9f839197cc7ee9698efbb6c470c0e34f2c74
Headers show

Comments

Katsunori FUJIWARA - March 31, 2014, 6:17 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1396287963 -32400
#      Tue Apr 01 02:46:03 2014 +0900
# Branch stable
# Node ID 44df0fef692bcf343d9e748ddb8d7bceb0b657aa
# Parent  e259d4c462b563ebcec7751a2e8291313e99bd59
merge: fix lack of "%s" in format string causing TypeError at runtime

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -70,7 +70,7 @@ 
                 bits = record.split("\0")
                 self._state[bits[0]] = bits[1:]
             elif not rtype.islower():
-                raise util.Abort(_('unsupported merge state record:'
+                raise util.Abort(_('unsupported merge state record: %s'
                                    % rtype))
         self._dirty = False
     def _readrecords(self):