[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

FW: Problem with merge-docx.js script in TortoiseSVN

From: Lübbe Onken | RA Consulting <l.onken_at_rac.de>
Date: Wed, 23 Jul 2008 12:03:50 +0200

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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_at_viewfinity.com]
        Sent: Wednesday, July 23, 2008 11:15 AM
        To: Lübbe Onken | RA Consulting
        Cc: pavel_a_at_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

         

         

         

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)

iD8DBQFIhwICm8gezyP1EasRAjuoAJ9Uj18MCcmRrR1dMlbtbNnx71k9xgCfcoBN
WPTUd82iBnOYkggA9gSmblY=
=uhJQ
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org

Received on 2008-07-23 12:04:07 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.