# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1254347002 25200
# Node ID 67df9f46f907e63446b9c7ec9cca2db540ecb160
# Parent  cec4b0d3fb02791aec8c3c7c4535a60945d4d45f
convert: unbreak non-svn engines

diff -r cec4b0d3fb02 -r 67df9f46f907 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Sat Sep 26 00:17:55 2009 +0300
+++ b/hgext/convert/subversion.py	Wed Sep 30 14:43:22 2009 -0700
@@ -22,7 +22,7 @@
 from common import commandline, converter_source, converter_sink, mapfile
 
 try:
-    raise "SVN support disabled due to license incompatibility"
+    raise ImportError("SVN support disabled due to license incompatibility")
     from svn.core import SubversionException, Pool
     import svn
     import svn.client
diff -r cec4b0d3fb02 -r 67df9f46f907 tests/hghave
--- a/tests/hghave	Sat Sep 26 00:17:55 2009 +0300
+++ b/tests/hghave	Wed Sep 30 14:43:22 2009 -0700
@@ -128,8 +128,10 @@
         matchoutput('rst2html.py --version', r'^rst2html.py \(Docutils')
 
 def has_svn():
-    return matchoutput('svn --version 2>&1', r'^svn, version') and \
-        matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
+    #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
 
 def has_svn_bindings():
     try: