Hi Pavel,
 
no I'm not the maintainer. Forwarding your doc-merge script to dev list so someone can review it there.
 
Cheers
-Lübbe

From: Pavel Aronsky [mailto:Pavel.Aronsky@viewfinity.com]
Sent: Wednesday, July 23, 2008 11:15 AM
To: Lübbe Onken | RA Consulting
Cc: pavel_a@fastmail.fm
Subject: Problem with merge-docx.js script in TortoiseSVN

Hi Luebbe,

 

Are you the maintainer of compare/merge scripts for TSVN?

 

In the last Windows version I’ve downloaded yesterday, the MS Word merge script (merge-docx.js) seems to be broken.

 

It has syntax errors when I run it on XP SP3, and (after fixing these errors) handling  of command line parameters  looks suspicious.

Arg #2 is not used…

 

Unfortunately I’m not familiar with Word scripting and don’t know how to program 3-way merge.

At least I’m attaching fix for some syntax errors (not a patch – please compare against original).

 

The compare script seems to work ok.

 

Regards,

Pavel