Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/svn.py

Issue 25447003: Make svndiff.py work on Windows and with svn 1.7. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/svndiff.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/svn.py
===================================================================
--- tools/svn.py (revision 11593)
+++ tools/svn.py (working copy)
@@ -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])
« no previous file with comments | « no previous file | tools/svndiff.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698