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

Re: Open Office documents (ODF)

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 27 Oct 2008 18:57:42 +0100

Freeman wrote:
> Hello:
>
> right now we are documenting a project and decide to use OpenOffice an
> its format, but when we have a conflict into a file, We cannot have
> option to do a merge easily, so we experiment with a .doc extension,
> but Tortoise says that we must have MS Office. then:

*.doc (and other office extensions) are by default registered to the
Office diff/merge scripts.

> 1) How we can compare and resolve conflicts in ODF using Subversion
> and Tortoise calling OOo?

Settings dialog->external programs->diff viewer (or merge tool)->Advanced
Then change the .doc extension to the same external program (script) as
for .ods.

Stefan

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

Received on 2008-10-27 18:57:54 CET

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