[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-18 18:51:58 CEST

Je¾ek Lubomír wrote:
> 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)

That has absolutely nothing to do with your problem. You're not exporting.

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

That's not true. It works for me just fine.

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 Wed Oct 18 18:53:35 2006

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