[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: SteveKing <steveking_at_gmx.ch>
Date: 2005-03-05 17:34:59 CET

NeoN wrote:

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

I can see that, yes.

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

You can do that with TSVN too! Just set the registry key
HKCU\Software\TortoiseMerge\Debug (DWORD key) to 1
or for TortoiseProc the registry key is

> 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

> It seems the %base parameters somehow gets concatenated with the next
> parameter.
> I hope this helps you to reproduce this.

Do you have any extension specific merge tools set? (Advanced... button
in the settings dialog, diff/merge tab).

I've checked the logs from revision 2734 (the version you're using) and
HEAD (the one I'm trying to reproduce this with). There were some
changes to that part of the code which might have something to do with
this. So maybe you can try another nightly build next week (they're not
updated until Russell gets back) and then report back if it still
doesn't work?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Mar 5 17:35:33 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.