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

Unified Diff: drover.py

Issue 22814005: When reverting, just reverse merge the entire revision. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: updates Created 7 years, 4 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: drover.py
diff --git a/drover.py b/drover.py
index be3315002ba99f6c192cbe5a22c35dc7bc26e3f5..d59a7a50d0ef7133a389319323437b3ca81f6cca 100755
--- a/drover.py
+++ b/drover.py
@@ -275,12 +275,9 @@ def revertExportRevision(url, revision):
os.system(command)
def revertRevision(url, revision):
- paths = getBestMergePaths(url, revision)
- for path in paths:
- command = ('svn merge -N -r ' + str(revision) + ":" + str(revision-1) +
- " " + url + path + " ." + path)
- print command
- os.system(command)
+ command = ('svn merge --ignore-ancestry -c -%d %s .' % (revision, url))
+ print command
+ os.system(command)
def getFileInfo(url, revision):
global files_info_
« 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