diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -22,7 +22,6 @@ from common import NoRepo, MissingTool, from common import commandline, converter_source, converter_sink, mapfile try: - raise ImportError("SVN support disabled due to license incompatibility") from svn.core import SubversionException, Pool import svn import svn.client diff --git a/tests/hghave b/tests/hghave --- a/tests/hghave +++ b/tests/hghave @@ -128,10 +128,8 @@ def has_rst2html(): return False def has_svn(): - #return matchoutput('svn --version 2>&1', r'^svn, version') and \ - #matchoutput('svnadmin --version 2>&1', r'^svnadmin, version') - # disabled until licensing issue is resolved - return False + return matchoutput('svn --version 2>&1', r'^svn, version') and \ + matchoutput('svnadmin --version 2>&1', r'^svnadmin, version') def has_svn_bindings(): try: