diff mercurial/cmdutil.py @ 24027:f2a631c7387a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Feb 2015 19:10:03 -0600
parents 942a5a34b2d0
children 8d295ce6e488 ac41aa4a66ab
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Wed Jan 14 14:24:16 2015 -0800
+++ b/mercurial/cmdutil.py	Tue Feb 03 19:10:03 2015 -0600
@@ -1091,8 +1091,8 @@
 
             if copies:
                 self.ui.write(',\n  "copies": {%s}' %
-                              ", ".join('"%s": %s' % (j(k), j(copies[k]))
-                                                      for k in copies))
+                              ", ".join('"%s": "%s"' % (j(k), j(v))
+                                                        for k, v in copies))
 
         matchfn = self.matchfn
         if matchfn: