[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-16 09:53:35 CEST

I now this tools (scX) and I write tool like this SCCTEXT.PRG . This is no problem (I convert FRX and PJX with cursortoxml(),SCX and VCX with other tools. My friend write service on Windows XP, that monitor file stream on NFTS, when VFP change same files, this services convert this file to SC2,VC2(text) files). So he write tool to merge VCX and SCX (in VFP, register this tool in TSVN)

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 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

and in options is possible only lower case

-----Original Message-----
From: Garrett Fitzgerald [mailto:sarekofvulcan@gmail.com]
Sent: Monday, October 16, 2006 8:46 AM
To: users@tortoisesvn.tigris.org
Subject: Re: bug with case sensitive on resolve conflict?

On 10/13/06, Ježek Lubomír <jezek@jkr.cz> wrote:
> when I type .VCX, program write .vct(option dialog mask case to
> lower?), e.g. later in menu, when I wont "Resolve conflict", TSVN run
> TortoiseMerge , no my program, because .vcx<>.VCX

Jezek, you might want to look into Paul McNett's scX utility: it's designed to turn VFP's binary files into their ASCII equivalents, so that merging works properly, and back again. It's based on SCCTEXT.PRG, with lots of enhancements over the base VFP version.

http://paulmcnett.com/scX.php

---------------------------------------------------------------------
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 Mon Oct 16 09:52:39 2006

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