[TSVN] File "names" in 3-way diff?

I was messing around with KDiff3 and trying to get it set up with TSVN. For
a normal diff, I use the following command:

  kdiff3.exe %base %mine --L1 %bname --L2 %yname

Which works wonderfully (%bname and %yname are shown). However, doing the
same for Diff3, not so much:

  kdiff3.exe %base %theirs %mine -o %merged \
    --L1 %bname --L2 %tname --L3 %yname

Doesn't seem to pass the names to kdiff3. I've done it on the command line
and it works (i.e. to test that it works with kdiff3). If I hard code some
thing for --L1 (and --L2, --L3), I get those just fine. Based on the
behavior I see, it looks like %bname is null, or at least whitespace.

And I won't even ask why I can't seem to get the "advanced" feature to
support a seperate diff3 program (nothing seems to get passed in in that
case) until I can figure this out.

Been using TSVN since .2x. I mostly work on *nix, but if I have to do a
merge I do it on my windows PC just so I can use TSVN for all this stuff
because it's so slick.

Thanks,

- hoffer

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Feb 27 21:18:44 2005