[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: RE: 3rd-party merging tools? Recommendations?

From: Gillis, Paul <pgillis_at_insight-tek.com>
Date: 2006-02-13 14:41:51 CET

I've got a related question for you all about the way TSVN launches
external diff tools.

If I select 2 files, TSVN launches the external diff tool just fine.
But if I select 2 directories I want to diff, TSNV will do its own
unified diff instead of launching the external diff tool I've specified.
If I select 2 directories outside of TSVN, the diff tool presents the
information in a much more useful way.

What must I do to get TSVN to simply launch the diff tool and pass it
the directory names and their contents? The TSVN documentation admits
it doesn't handle diffs of directories very well and the solution is to
use an external tool. But TSVN refuses to launch the external diff tool
when I select directories to diff.

Any help would be appreciated. Thanks!

- Paul

-----Original Message-----
From: Matt England [mailto:mengland@mengland.net]
Sent: Sunday, February 12, 2006 5:25 PM
To: rory@clarkzoo.org
Cc: 'Bart Robinson'; 'Matthew England'; 'SVN Users email list'
Subject: RE: 3rd-party merging tools? Recommendations?

Do all of these software utilities (the ones below) automatically read
and
manage the svn-conflict-generating files (eg, .mine, .rXX, etc)?

-Matt

At 2/12/2006 01:11 PM, Rory Clark wrote:
>I use BeyondCompare 2 (http://www.scootersoftware.com/) for both
diff'ing
>and merging, especially since you see the two files side by side and
then
>have ability to manually align (in the case code blocks that have moved
>around), copying lines from one side to the other, manually editing
lines,
>and, of course, saving those changes back to disk.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

This e-mail message and all attachments thereto may contain technical data that is subject to export control regulations, or confidential material, and is for the sole use of the intended recipients. Review, dissemination, or other use by anyone else is prohibited. if you are not an intended recipient, please contact the sender and delete all copies.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 13 14:46:06 2006

This is an archived mail posted to the Subversion Users mailing list.