[TSVN] External merge tool does not work (tname, bname and yname seem broken)

Hi,

I've upgraded to latest release of TSVN and now external merge does
not work. Seems that %tname, %bname and %yname are broken.

To repro:

1. Create file c:\kk.bat with these contents:

@echo %*
pause

2. Set external merge tool as this even if you don't have Araxis Merge
Comparer (these are the params I need for it to work).

C:\kk.bat /max /wait /3 /title1:"%tname" /title2:"%bname"
/title3:"%yname" %theirs %base %mine %merged /a2

3. Get a conflict then try to fix it. You'll get a cmd.exe window as
expected.

3a. What I expected

/max /wait /3 /title1:"title of theirs file" /title2:"title of base
file" /title3:"title of my file" "file.r4419" "file.r4417" "file" /a2

3b. What I get

/max /wait /3 /title1:" /title2:" /title3:" "file.r4419" "file.r4417"
"file" /a2

Best regards,

Fernando Najera

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Dec 30 11:33:46 2004