# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1257889333 -3600
# Node ID 8b3e0435e690bfc325a3d8be7aaa399e46426f3c
# Parent  7d2e9121ef4f86cb7d1a26eb44ba1780d2941699# Parent  dec177286deb786886f0de31b6e24c282162eee6
merge with crew

diff -r 7d2e9121ef4f -r 8b3e0435e690 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Sat Nov 07 12:28:31 2009 +0100
+++ b/hgext/convert/subversion.py	Tue Nov 10 22:42:13 2009 +0100
@@ -22,7 +22,6 @@
 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 -r 7d2e9121ef4f -r 8b3e0435e690 tests/hghave
--- a/tests/hghave	Sat Nov 07 12:28:31 2009 +0100
+++ b/tests/hghave	Tue Nov 10 22:42:13 2009 +0100
@@ -128,10 +128,8 @@
     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: