diff -r d51c658d3f04 -r 56b2bcea2529 mercurial/phases.py --- a/mercurial/phases.py Mon Oct 05 22:49:24 2015 -0700 +++ b/mercurial/phases.py Thu Oct 08 12:55:45 2015 -0700 @@ -115,7 +115,6 @@ ) from . import ( error, - util, ) allphases = public, draft, secret = range(3) @@ -306,7 +305,7 @@ if self.phase(repo, repo[n].rev()) < targetphase] if newroots: if nullid in newroots: - raise util.Abort(_('cannot change null revision phase')) + raise error.Abort(_('cannot change null revision phase')) currentroots = currentroots.copy() currentroots.update(newroots) ctxs = repo.set('roots(%ln::)', currentroots)