• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28469 (tree)
Time2019-01-05 18:46:20
Authorstefankueng

Log Message

Show an error if the %mine and %merged path are not the same.

Change Summary

Incremental Difference

--- trunk/contrib/diff-scripts/merge-ods.vbs (revision 28468)
+++ trunk/contrib/diff-scripts/merge-ods.vbs (revision 28469)
@@ -28,6 +28,12 @@
2828 sMyDoc = objArgs(2)
2929 sBaseDoc = objArgs(3)
3030
31+'since i haven't found a way to tell OO a new "save" path after a document is opened,
32+'the %mine and %merged paths need to be identical since it always saves to the %mine path
33+if (sMergedDoc <> sMyDoc) Then
34+ MsgBox "paths %mine and %merged must be identical", vbExclamation, "wrong parameters"
35+ Wscript.Quit 1
36+End If
3137 Set objScript = CreateObject("Scripting.FileSystemObject")
3238 If objScript.FileExists(sMyDoc) = False Then
3339 MsgBox "File " + sMyDoc + " does not exist. Cannot compare the documents.", vbExclamation, "File not found"
Show on old repository browser