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

How to invoke merge-doc.js?

From: Arnout Engelen <tigris_at_bzzt.net>
Date: Tue, 13 Dec 2011 03:05:15 -0800 (PST)

Hello,

I'm looking for a way to support a workflow where various people propose changes to a word document, and a limited number of people accept or reject these changes into the 'official' version of the document.

Managing the official version in the trunk of an SVN repository and giving various people access to a branch (or multiple branches) would seem to be an interesting approach.

Some sort of '3-way-merge' for word documents would be required for this. It looks like tortoisesvn supports this in 'merge-doc.js'.

However, I'm having trouble invoking this script. In Settings->External_Progams->Merge_Tool->Advanced_merge_settings, indeed 'wscript.exe ... merge-doc.js ...' is configured. However, when I try to merge a branch into trunk, the 'Edit conflict' button of the 'Resolve Conflict' dialog is grayed out.

How do I invoke the merge-doc.js functionality?

Kind regards,

Arnout Engelen

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2892896

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-13 12:12:02 CET

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