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

Re: merge-docx.js doesn't start up Word 2007

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 21 Nov 2008 22:17:15 +0100

Erik wrote:
> Thanks for the answers!
>
> Stefan, as it is possible to start Word in "diff mode" when selecting
> the diff option in tortoise, then why whould you not be able to call
> Word when doing a "resolve conflicts" during a merge on .docx files.

Because doing diffs/resolving-conflicts on local files is something
completely different than during a merge. During a merge, the full files
are not available, so using the diff/merge scripts won't work (that's
why it doesn't work at all with binary files).

> I wouldn't expect Tortoise to resolve the conflicts itself (because
> they are binary after all), but it would be nice if it opens the right
> files in Word for me >during< a merge operation. Word seems to offer
> the right options, so why not?

See above.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-11-21 22:17:35 CET

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

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