Skip to content

Commit

Permalink
When reverting, just reverse merge the entire revision.
Browse files Browse the repository at this point in the history
Since we already checked out all files that were touched in the revision
to revert, it should just work[tm].

BUG=64643
[email protected], [email protected], [email protected]
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
  • Loading branch information
[email protected] committed Aug 22, 2013
1 parent 89f91d4 commit d2046a8
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drover.py
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Expand Down

0 comments on commit d2046a8

Please sign in to comment.