From e08149a25c60190e536c8f1d7129f2d0e1750dee Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Wed, 13 May 2009 18:41:14 +0000 Subject: [PATCH] Fix revert.py. Review URL: http://codereview.chromium.org/113353 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@15977 0039d316-1c4b-4281-b951-d872f2087c98 --- revert.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/revert.py b/revert.py index 8d862d626..1bc7421d2 100755 --- a/revert.py +++ b/revert.py @@ -134,7 +134,7 @@ def Revert(revisions, force=False, commit=True, send_email=True, message=None, 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 @@ def Revert(revisions, force=False, commit=True, send_email=True, message=None, 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)