Make svndiff.py work on Windows and with svn 1.7.
R=epoger@google.com
Review URL: https://codereview.chromium.org/25447003
git-svn-id: http://skia.googlecode.com/svn/trunk@11642 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/svn.py b/tools/svn.py
index 72d8ad8..aac8970 100644
--- a/tools/svn.py
+++ b/tools/svn.py
@@ -135,7 +135,7 @@
if status & STATUS_NOT_UNDER_SVN_CONTROL:
status_types_string += '\?'
status_regex_string = '^[%s].....\s+(.+)$' % status_types_string
- stdout = self._RunCommand([SVN, 'status'])
+ stdout = self._RunCommand([SVN, 'status']).replace('\r', '')
status_regex = re.compile(status_regex_string, re.MULTILINE)
files = status_regex.findall(stdout)
return files
@@ -179,5 +179,5 @@
version you wish to obtain
@param dest_path destination to which to write the base content
"""
- self._RunCommand([SVN, 'export', '--revision', 'BASE',
+ self._RunCommand([SVN, 'export', '--revision', 'BASE', '--force',
file_within_repo, dest_path])