#1 Added compatibility with Subversion 1.6.

--HG--
branch : distribute
extra : rebase_source : 40579bb8174f21d24968ce698711c66f624c0839

3 files changed, 7 insertions, 3 deletions

diff --git a/setuptools.txt b/setuptools.txt
index d1b25302..79cd3b3f 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -2612,6 +2612,9 @@ Release Notes/Change History
 ----------------------------
 
 0.6final
+
+ * Added compatibility with Subversion 1.6.
+
  * Fixed a missing files problem when using Windows source distributions on
    non-Windows platforms, due to distutils not handling manifest file line
    endings correctly.
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9741e26a..b14a78b0 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -217,9 +217,9 @@ class egg_info(Command):
             data = f.read()
             f.close()
 
-            if data.startswith('9') or data.startswith('8'):
+            if data.startswith('10') or data.startswith('9') or data.startswith('8'):
                 data = map(str.splitlines,data.split('\n\x0c\n'))
-                del data[0][0]  # get rid of the '8' or '9'
+                del data[0][0]  # get rid of the '8' or '9' or '10'
                 dirurl = data[0][3]
                 localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
             elif data.startswith('<?xml'):
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 5bd5ebd4..9f692493 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -86,8 +86,9 @@ def entries_finder(dirname, filename):
     f = open(filename,'rU')
     data = f.read()
     f.close()
-    if data.startswith('9') or data.startswith('8'):    # subversion 1.5/1.4
+    if data.startswith('10') or data.startswith('9') or data.startswith('8'):
         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
+            # subversion 1.6/1.5/1.4
             if not record or len(record)>=6 and record[5]=="delete":
                 continue    # skip deleted
             yield joinpath(dirname, record[0])