[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 14:42:35 CET

Saturday, March 5, 2005, 10:55:00 AM, you wrote:

>> But now, when I "compare with working copy", I get a two-paned instead
>> of a three-paned TortoiseMerge. The left pane says "Working Base (not
>> found)", the right one "Working Copy".

> I can't reproduce that. It works fine here.
> Can you check your path settings in the settings dialog, diff/merge tab?
> Maybe you've got something there which causes this.

I have everything set to "Builtin". I have made some screenshots to
clarify: http://users.telenet.be/pompom/tortoise/
Notice how " \theirs:" is appended to the filename in the left pane.

It seems there is a problem with the %base parameter. If I set the
external merge program to
TortoiseMerge.exe /theirs:%theirs /yours:%mine /base:%base
I get the expected result.
But when it is set to
TortoiseMerge.exe /base:%base /theirs:%theirs /yours:%mine
the result is wrong, like with the builtin option.

I have tried a program that just prints out the command line
parameters as external merge tool, which gives these results:

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

If the order is /base, /theirs, /yours (with double quotes around
%base, %theirs and %mine):
1: /base:G:\temp\merge1\.svn\text-base\test.txt.svn-base /theirs:"c:\temp\svn000
2: /yours:G:\temp\merge1\test.txt

If the order is /base, /theirs, /yours (without double quotes):
1: /base:G:\temp\merge1\.svn\text-base\test.txt.svn-base /theirs:c:\temp\svn001.
tmp.txt /yours:G:\temp\merge1\test.txt

It seems the %base parameters somehow gets concatenated with the next

I hope this helps you to reproduce this.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Mar 5 14:42:25 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.