Mercurial > hgsubversion

diff tests/test_pull.py @ 1555:cff81f35b31e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: reference Abort from mercurial.error instead of mercurial.util It's been there since hg 1.7 or so, which lets us avoid any need for compat shims.
author Augie Fackler <raf@durin42.com>
date Sat, 24 Mar 2018 16:39:30 -0400
parents 4f1461428334
children
line wrap: on
line diff
--- a/tests/test_pull.py
+++ b/tests/test_pull.py
@@ -2,6 +2,7 @@ import test_util
 
 import os.path
 import subprocess
+from mercurial import error as hgerror
 from mercurial import node
 from mercurial import ui
 from mercurial import util as hgutil
@@ -47,7 +48,7 @@ class TestPull(test_util.TestBase):
         self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed one way'})
         try:
             commands.pull(self.repo.ui, repo, update=True)
-        except hgutil.Abort:
+        except hgerror.Abort:
             # hg < 1.9 raised when crossing branches
             pass
         self.assertEqual(state, repo[None].parents())