Mercurial > hg
changeset 9822:8b3e0435e690
merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 10 Nov 2009 22:42:13 +0100 |
| parents | 7d2e9121ef4f (current diff) dec177286deb (diff) |
| children | 11d7bb5e0df2 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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: