On Fri, Nov 21, 2008 at 03:29, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Erik wrote:
>> I'm probably very impatient, but I would really like it if someone
>> could point me in the right direction, I'm stuck on the issue!
>> Has the fact that the "resolve conflict" buttons aren't shown anything
>> to do with the merge-docx.js script, or not?
>
> not with the scripts, no.
>
>> If so, what can I change in the script to make them appear?
>
> No, sorry.
> See below for more info...
>
>>>
>>> I've been trying to use subversion and tortoise to merge my Word
>>> 2007 .docx files and ran into some difficulties.
>>>
>>> The default diff functionality works fine > it starts Word in "diff"
>>> mode with both files loaded.
>>>
>>> However, the default merge-docx.js script does not seem to work. When
>>> I try to merge two files from two different branches tortoise tells me
>>> there is a conflict, but the "resolve conflict" buttons are not
>>> available (both "edit conflict" and "resolved" are greyed out).
>
> 'live' conflict resolving during a merge only works with text files.
> Your office files are binary.
> You have to use "resolve later" for those files during a merge or chose
> mine or theirs.
>
> If you chose "resolve later", then after the merge has finished you can
> then use the edit-conflicts function (which then uses the merge script).
>
>>> I would expect the buttons to be available and to start word 2007 in
>>> Merge mode. I've seen on the Microsoft developer site that there are
>>> methods that can be called (MergeDocuments), but I'm not familiar with
>>> scripting and don't know how to adjust the merge-docx.js file so it
>>> works.
>
> I don't even have MS office installed, so I definitely won't be able to
> help you improve the scripts.
WIsh I could help but the only MS Office I have that can handle DOCX
doesn't run on Windows. My wife is plenty happy w/ her Office XP and
doesn't want to have to learn the ribbon.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-21 13:08:58 CET