In fact, I've sent this patch to the KDiff3 project.
Unfortunately, while the integration works, it uses texts MINE, BASE and WORKING
to identify the files it's working with. However, it's easier to just use the
filenames of the files, as these also contain the revision numbers of the files
you're comparing.
A better integration of TSVN and KDiff3 would be:
- for diff: $INSTDIR\kdiff3.exe %base %mine --L1 %bname --L2 %yname
- for merge: $INSTDIR\kdiff3.exe %base %mine %theirs -o %merged --L1 %bname --L2
%yname --L3 %tname
I'll send an updated patch to Joachim for KDiff3.
Lieven.
Quoting "Milen A. Radev" <milen@radev.net>:
> On 10/04/06, Norbert Unterberg <nunterberg@gmail.com> wrote:
> > 2006/4/9, Milen A. Radev <milen@radev.net>:
> > > The installer of the latest version of KDiff3 - 0.9.89, has one very
> > > nice option - TSVN Integration. See the attached screenshot.
> >
> > What does this integration do?
>
> It sets your "Diff Viewer" and "Merge Tool" to "External" and fills in
> appropriate command line for its invocation.
>
> > I tried KDiff3 some time ago and I dropped it because it ignored the
> > Unicode BOM and messed up our UTF-8 files.
>
> I had have no such problems so far.
>
> --
> Milen A. Radev
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>
----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Apr 10 17:06:46 2006