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

Re: bug with case sensitive on resolve conflict?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-10-16 20:08:08 CEST

Je¾ek Lubomír wrote:

> Problem is with new version of TSVN(I have .VCX file with upper case)
> Old version for .VCX files, when I can resolve conflict, run our
> program New version (1.4.0.7737) for .vcx files, when I can resolve
> conflict, run TortoiseMerge When I change in registry option .vcx to
> .VCX, it is the same. TSVN run TortoiseMerge When I change in

I just tried this. Works fine for me:
* added merge tool for '.vcx' files (path to a test program just showing
a messagebox so I know it was started instead of TMerge)
* created a conflict for 'file1.VCX' (notice the uppercase extension)
* choose "edit conflicts" from the context menu
* my test tool was started

> registry option .vcx to .VCX, add second line .vcx (e.g. I have in
> option VCX and .vcx with my program), TSVN run TortoiseMerge. Why? My
> opinion is: For looking program to merge, TSVN make lower on
> extension (when find in options). Then look to file extension. This
> is in uppercase and compare it with lowercase ... not found, run
> TortoseMerge LJ

It has absolutely nothing to do with lower/uppercase extensions. The
case of those is irrelevant because TSVN ignores the case there.

Please check your configuration carefully again - maybe you have a '#'
in front of the path to the tool?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Oct 16 20:08:19 2006

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