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