Make svndiff.py work on Windows and with svn 1.7.

tools/svn.py

 '''
 Copyright 2011 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 import fnmatch
 import os
 import re
@@ skipping 117 matching lines @@
         status_types_string = ''
         if status & STATUS_ADDED:
             status_types_string += 'A'
         if status & STATUS_DELETED:
             status_types_string += 'D'
         if status & STATUS_MODIFIED:
             status_types_string += 'M'
         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
 
     def AddFiles(self, filenames):
         """Adds these files to SVN control.
 
         @param filenames files to add to SVN control
         """
         self._RunCommand([SVN, 'add'] + filenames)
@@ skipping 23 matching lines @@
         self.SetProperty(matching_files, property_name, property_value)
 
     def ExportBaseVersionOfFile(self, file_within_repo, dest_path):
         """Retrieves a copy of the base version (what you would get if you ran
         'svn revert') of a file within the repository.
 
         @param file_within_repo path to the file within the repo whose base
                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])