Commit d2046a80 authored by jochen@chromium.org's avatar jochen@chromium.org

When reverting, just reverse merge the entire revision.

Since we already checked out all files that were touched in the revision
to revert, it should just work[tm].

BUG=64643
R=agable@chromium.org, maruel@chromium.org, phajdan.jr@chromium.org
TEST=tested manually that svn merge -r (without -N) reverts directory deletes

Review URL: https://codereview.chromium.org/22814005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@219094 0039d316-1c4b-4281-b951-d872f2087c98
parent 89f91d41
......@@ -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_
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment