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

Re: TSVN Bug

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 18 Jul 2008 19:18:14 +0200

On Fri, Jul 18, 2008 at 18:25, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Please always reply to the mailing list.
>
> MARICH, DAVID CIV DFAS wrote:
>>
>> wscript.exe "C:\Program Files\TortoiseSVN\Diff-Scripts\merge-doc.js"
>> %merged %theirs %mine %base //E:javascript
>>
>> This is the actual string that is specified in the program column. It
>> is what comes by default and it is correct. As I stated though, TSVN
>> doesn't appear to even be attempting to run the command.
>>
>> I might add two things that I've noticed that are possibly related to
>> the bug at hand - TSVN does execute the script specified for an
>> external diff program for .doc files just fine (for the 'Diff' and
>> 'Diff with previous version' commands). It's only for the merge tool
>> that it fails. Secondly, if I delete the mime-type property from the
>> conflicted file, TSVN does correctly execute the script and does use
>> Word to perform the merge.
>
> I see. Do you have a merge tool specified for the mime type too? If you have
> specified one for a specific mime-type (e.g., "application/word"), then TSVN
> will use that one instead of the one associated with the extension.
>
> But I think there actually might be a bug here (I'll have to do some tests
> to make sure) that if a mime-type is set on a file, it might not use the
> tool associated with the extension at all.

Bug confirmed. If the file has an svn:mime-type set, the merge tool
configured for the file extension is not used.

Fixed in 13499, backported to the 1.5.x branch in r13500.

Stefan

-- 
 ___
 oo // \\ "De Chelonian Mobile"
 (_,\/ \_/ \ TortoiseSVN
 \ \_/_\_/> The coolest Interface to (Sub)Version Control
 /_/ \_\ http://tortoisesvn.net
Received on 2008-07-18 19:18:28 CEST

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