changeset 18297 | 7196f11c5c7d |
parent 18296 | a74101cd6965 |
child 18364 | 6252b4f1c4b4 |
--- a/mercurial/subrepo.py Thu Jan 10 10:35:37 2013 -0800 +++ b/mercurial/subrepo.py Thu Jan 03 17:42:25 2013 +0100 @@ -29,7 +29,7 @@ raise ex except error.Abort, ex: subrepo = subrelpath(self) - errormsg = _('%s (in subrepo %s)') % (str(ex), subrepo) + errormsg = str(ex) + ' ' + _('(in subrepo %s)') % subrepo # avoid handling this exception by raising a SubrepoAbort exception raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo) return res