# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1253711966 -7200
# Node ID ffaf6074d1bd8e267d140c39c2e2981162a60348
# Parent  a15813fae0a8f414228f9da768c235f9d017ebfa# Parent  f3f400b13984d175f44943de2cc348c435c4119e
merge with mpm

diff -r a15813fae0a8 -r ffaf6074d1bd hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Tue Sep 22 13:30:32 2009 +0200
+++ b/hgext/convert/subversion.py	Wed Sep 23 15:19:26 2009 +0200
@@ -22,6 +22,7 @@
 from common import commandline, converter_source, converter_sink, mapfile
 
 try:
+    raise "SVN support disabled due to license incompatibility"
     from svn.core import SubversionException, Pool
     import svn
     import svn.client