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