diff -r d51c658d3f04 -r 56b2bcea2529 mercurial/unionrepo.py --- a/mercurial/unionrepo.py Mon Oct 05 22:49:24 2015 -0700 +++ b/mercurial/unionrepo.py Thu Oct 08 12:55:45 2015 -0700 @@ -21,6 +21,7 @@ from . import ( changelog, cmdutil, + error, filelog, localrepo, manifest, @@ -231,7 +232,7 @@ def instance(ui, path, create): if create: - raise util.Abort(_('cannot create new union repository')) + raise error.Abort(_('cannot create new union repository')) parentpath = ui.config("bundle", "mainreporoot", "") if not parentpath: # try to find the correct path to the working directory repo