diff hgext/mq.py @ 16232:877aea86fb73

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Mar 2012 15:59:33 -0600
parents a4413624d014 ce292f1379ba
children e8eecfe37d4e
line wrap: on
line diff
--- a/hgext/mq.py	Sun Mar 04 17:14:30 2012 -0600
+++ b/hgext/mq.py	Thu Mar 08 15:59:33 2012 -0600
@@ -1193,7 +1193,8 @@
                 root = self.series[start]
                 target = patchheader(self.join(root), self.plainmode).parent
                 if not target:
-                    raise util.Abort(_("%s does not have a parent recorded" % root))
+                    raise util.Abort(
+                        _("%s does not have a parent recorded") % root)
                 if not repo[target] == repo['.']:
                     hg.update(repo, target)