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

RE: Three-Way Diff Request

From: Gleason, Todd <tgleason_at_impac.com>
Date: Wed, 20 Feb 2008 07:57:47 -0800

In case a, you can get that information by using TortoiseSVN->Blame. It
tells you what revision and user introduced every line in the file.
Note that it takes a bit to run, but it sounds like the easiest way to
get what you want. Then you can see the changes in more detail by
showing the log and doing a simple two-way diff.

 

The 3-way diff in case b does not seem to be addressed by TortoiseSVN.
While TortoiseMerge supports 3-way merging, I don't know of a simple way
to do what you suggest (explicitly-selected 3-way diff without intention
of merging, or even implicitly-selected 3-way diff given two branch
revisions and implicitly selected ancestor). I guess if you got all
three files manually, and explicitly ran TortoiseMerge against them,
then you could do it. It does seem like a useful feature to me too. It
would also be nice to be able to point TortoiseMerge directly at the
Subversion repository with the same kind of URLs used in TortoiseSVN
elsewhere.

 

All that said, if I had my choice, I'd settle for the current 2-way
diffs if operations such as the revison graph, log messages, and diff
operations ran faster (which I'm guessing is more a server architecture
issue).

 

________________________________

From: Darryl Staflund [mailto:darryl.aj.staflund_at_shaw.ca]
Sent: Tuesday, February 19, 2008 1:54 PM
To: users_at_tortoisesvn.tigris.org
Subject: Three-Way Diff Request

 

Hi all,

 

TortoiseSVN is a great development tool in my environment. But it is
missing one important feature that I use regularly with other versioning
clients (in particular, the Perforce client), i.e. the ability to
perform three-way diffs of the source code.

 

Here are a couple of scenarios in which three-way diff is nice to have:

 

a. I want to determine in what version of code between two given
versions in the same branch a particular change was introduced into the
source code. I would like to be able to do this by viewing the log of
the file in question, selecting three different versions, and then
performing a three-way diff.

 

b. I want to compare how the same file in two different code branches
has changed over time with respect to their common ancestor (i.e. the
point at which the file was branched.) I would like to be able to do
this by viewing the revision graph of a given file, selecting a version
from each of the branches, and then performing a three-way diff.

 

Would it be possible to include this in a (near) future release of the
TortoiseSVN client?

 

Thank you,

Darryl Staflund
Received on 2008-02-20 16:58:00 CET

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