Chromium Code Reviews| Index: drover.py |
| diff --git a/drover.py b/drover.py |
| index be3315002ba99f6c192cbe5a22c35dc7bc26e3f5..517671b5e8c88efc28f6c193f68efee1431ad694 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 -c -%d %s .' % (revision, url)) |
|
Paweł Hajdan Jr.
2013/08/22 18:13:40
Drive-by: have you tested revert of a revert? And
|
| + print command |
| + os.system(command) |
| def getFileInfo(url, revision): |
| global files_info_ |