drover.py - Issue 22814005: When reverting, just reverse merge the entire revision.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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:

Index: drover.py

diff --git a/drover.py b/drover.py

index be3315002ba99f6c192cbe5a22c35dc7bc26e3f5..10ccb29be0628ecdeed7416362baecadab01eeb2 100755

--- a/drover.py

+++ b/drover.py

@@ -275,12 +275,10 @@ 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 -r ' + str(revision) + ":" + str(revision-1) +

agable 2013/08/22 09:15:14 This could also simply be 'svn merge -c -' + str(r

+ " " + 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 »