Hi there,
the diff-doc.js and merge-doc.js script have a typo which produces
errors when the script shows an error message. The problem is that
Wscript (with small 's' isn't defined).
The following patch corrects this problem.
Mathias
--- Diff-Scripts/diff-doc.js.orig 2006-04-06 12:35:55.811435900 +0200
+++ Diff-Scripts/diff-doc.js 2006-04-06 12:37:09.356700500 +0200
@@ -15,12 +15,12 @@
if ( ! objScript.FileExists(sBaseDoc))
{
WScript.Echo("File " + sBaseDoc + " does not exist. Cannot compare the documents.");
- Wscript.Quit(1);
+ WScript.Quit(1);
}
if ( ! objScript.FileExists(sNewDoc))
{
WScript.Echo("File " + sNewDoc +" does not exist. Cannot compare the documents.");
- Wscript.Quit(1);
+ WScript.Quit(1);
}
objScript = null;
@@ -31,8 +31,8 @@
}
catch(e)
{
- Wscript.Echo("You must have Microsoft Word installed to perform this operation.");
- Wscript.Quit(1);
+ WScript.Echo("You must have Microsoft Word installed to perform this operation.");
+ WScript.Quit(1);
}
word.visible = true;
--- Diff-Scripts/merge-doc.js.orig 2005-12-30 12:41:24.000000000 +0100
+++ Diff-Scripts/merge-doc.js 2006-04-06 12:24:35.301798500 +0200
@@ -17,12 +17,12 @@
if ( ! objScript.FileExists(sTheirDoc))
{
WScript.Echo("File " + sTheirDoc +" does not exist. Cannot compare the documents.", vbExclamation, "File not found");
- Wscript.Quit(1);
+ WScript.Quit(1);
}
if ( ! objScript.FileExists(sMergedDoc))
{
WScript.Echo("File " + sMergedDoc +" does not exist. Cannot compare the documents.", vbExclamation, "File not found");
- Wscript.Quit(1);
+ WScript.Quit(1);
}
objScript = null
@@ -33,8 +33,8 @@
}
catch(e)
{
- Wscript.Echo("You must have Microsoft Word installed to perform this operation.");
- Wscript.Quit(1);
+ WScript.Echo("You must have Microsoft Word installed to perform this operation.");
+ WScript.Quit(1);
}
word.visible = true
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Apr 6 12:52:05 2006