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

Re: [TSVN] Usage/Integration of Diff scripts?

From: Reinhard Brandstaedter <reinhard.brandstaedter_at_ams-engineering.com>
Date: 2005-07-21 16:37:12 CEST

Mark Phippard wrote:
> Reinhard Brandstaedter <reinhard.brandstaedter@ams-engineering.com> wrote
> on 07/21/2005 08:47:57 AM:
>
>
>>I've seen that there is a feature to create customized diff scripts
>>(which is really cool). I'm very interested in that feature because it
>>would mean I can develop own scripts for our needs.
>>I just beginning to play around with that and I'm trying to use the
>>Word/OO diff/merge scripts.
>>I see that the diff of word files is called fromt he tortoise context
>>menu with the normal diff/merge command if you set proper application
>>handlers for the extensions.
>>
>>Now I've tried to merge a conflicted word (Word 2002) file but all i get
>
>
>>is a file with garbage in it when it's displayed in word.
>>Is there any conversion made on the file when it's opened/in a
>>conflicted state?
>
>
> I wrote the scripts. I wouldn't recommend using the merge script. It
> seemed to work for me, but after I do a merge I can no longer use diff on
> that document.

OK then it's not a big thing that the merge part is not working for me
:-) I was just curious about this feature

> What sort of conversions are you talking about? It just takes the three
> MS Word documents and runs the Word merge command. Actually, it does not
> need to use the Base document.

I thought maybe there are some issues with encoding style of these
files. because as soon as I get a Word Document in conflicted state i
can not open the Base-Document (The one that usually contains the
">>>>>>>>" and "<<<<<<<<" comments when it's a text file)

Scenario: updating the working copy enters a conflicted state for a word
document. Which results in the usual files:
.doc > not a valid word file anymore
.doc.mine > valid word file
.doc.rXX > valid word file
.doc.rYY > valid word file
With text files i would call "edit conflicts" which calls the merge
program with the appropriate parameters (vbs file for .doc files).
This is the way it's meant to be, right? I just doesn't work properly
with word/binary files yet.

I wanted to call the vbs for merging from the commandline and use the
.mine, .rXX and .rYY of the conflicted file and create a new .merged
file but this didn't work.

But not a big issue...time will come and merging of word files will
work... or we switch to professional documentation formats TeX maybe :-)

Reinhard

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 21 16:37:30 2005

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