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

Re: [TSVN] Compares with base not with working copy

From: NeoN <neon_at_telenet.be>
Date: 2005-03-05 23:04:48 CET

Saturday, March 5, 2005, 5:34:59 PM, you wrote:

>> It seems there is a problem with the %base parameter.

>> If the order is /theirs, /yours, /base, it works correctly:
>> 1: /theirs:c:\temp\svn002.tmp.txt
>> 2: /yours:G:\temp\merge1\test.txt
>> 3: /base:G:\temp\merge1\.svn\text-base\test.txt.svn-base

> That doesn't really help here. You get the wrong paths if you don't set
> anything custom but use the "builtin" settings. So that's what I have to
> reproduce.

Yes, but I also get wrong paths if I use TortoiseMerge as external
merge tool, except when /base is specified last.
The "builtin" setting just calls TortoiseMerge too, right? I may be
wrong, I just started using TSVN recently...

>> It seems the %base parameters somehow gets concatenated with the next
>> parameter.

Using the debug setting you described I found out that the %base
parameter starts with a double quote, but doesn't have a closing
double quote. That explains the concatenation with the next

But since you can't reproduce it in the HEAD, I suppose it's already



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Mar 5 23:05:01 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.