[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: Ježek Lubomír <jezek_at_jkr.cz>
Date: 2006-10-17 22:55:16 CEST

I download last version TSVN(1.4.0.7778) and problem is corected. May be this in changelog:
- BUG: The exporting options didn't always work correctly with externals.
       See issue #302 for details. (Stefan)

Problem was not in uppercase(sorry). Problem was other:
TSVN not start program that I set in
Settings/External Programs/Merge Tools/
There is option on Tortoisemerge
On Advanced... is

for extension scx, vcx,sct,vct
is

"C:\Program Files\Microsoft Visual FoxPro 9\vfp9.exe" "C:\Program Files\SOURCE\Source Keeper\mergetools.exe" %merged %theirs %mine %base

When main switch is TortoiseMerge, TSVN allways start TortoiseMerge, e.g. advanced settins don't work.
When I set as "External" program my vfp9 ..., TSVN starts my program (for all extension, but its OK for my)
Only for 1.4.0.7737, for latest 1.3 (on computers of my frends) it works OK. Now for 1.4.0.7778 is OK too.
LJ

-----Original Message-----
From: Stefan Küng [mailto:tortoisesvn@gmail.com]
Sent: Monday, October 16, 2006 8:08 PM
To: users@tortoisesvn.tigris.org
Subject: Re: bug with case sensitive on resolve conflict?

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
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Oct 17 22:54:22 2006

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