Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/treediscovery.py
changeset 26587 56b2bcea2529
parent 25987 c6d049a5de43
child 37634 0ed11f9368fd 
--- a/mercurial/treediscovery.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/treediscovery.py	Thu Oct 08 12:55:45 2015 -0700
@@ -16,7 +16,6 @@
 )
 from . import (
     error,
-    util,
 )
 
 def findcommonincoming(repo, remote, heads=None, force=False):
@@ -149,7 +148,7 @@
         if force:
             repo.ui.warn(_("warning: repository is unrelated\n"))
         else:
-            raise util.Abort(_("repository is unrelated"))
+            raise error.Abort(_("repository is unrelated"))
 
     repo.ui.debug("found new changesets starting at " +
                  " ".join([short(f) for f in fetch]) + "\n")
mercurial