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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: revert.py

Issue 113353: Fix revert.py. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: Created 11 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: revert.py
===================================================================
--- revert.py (revision 15959)
+++ revert.py (working copy)
@@ -134,7 +134,7 @@
print ""
# Make sure these files are unmodified with svn status.
- status = gcl.GetSVNStatus(files)
+ status = gclient.CaptureSVNStatus(files)
if status:
if force:
# TODO(maruel): Use the tool to correctly revert '?' files.
@@ -178,6 +178,7 @@
print 'svn up . -N failed in %s/.' % root
return retcode
+ # TODO(maruel): BUG WITH ONLY ONE FILE.
command = ["svn", "merge", "-c", revisions_string_rev]
command.extend(file_list)
(output, retcode) = gcl.RunShellWithReturnCode(command, print_output=True)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698