Mercurial > hg
changeset 9819:dec177286deb
convert: reenable SVN support after license issue solved
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 10 Nov 2009 22:32:17 +0100 |
| parents | 72d670c43f6e |
| children | 8b3e0435e690 |
| files | hgext/convert/subversion.py tests/hghave |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Sun Nov 08 18:08:24 2009 +0100 +++ b/hgext/convert/subversion.py Tue Nov 10 22:32:17 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
--- a/tests/hghave Sun Nov 08 18:08:24 2009 +0100 +++ b/tests/hghave Tue Nov 10 22:32:17 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: