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

Re: How to diff file within working copy based on branch against trunc?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-04-18 18:46:21 CEST

Lorenz wrote:

> I'm merging multiple changes from trunc into a branch and want to diff
> a file in my working copy against the corresponding file in trunc.
>
> The methode I'm using in the moment is a bit laborious: I fire up the
> repo browser, copy the respective file from trunc@... into my working
> copy and do the diff. Afterwards I delete the tmp file again.

You can also select the two files directly in the repobrowser and choose
"compare".

> Is there an easier way to do this?
>
> If not, I'd like to propose to add a "diff against ..." entry in the
> context menu of working copy files. It would open the repo browser to
> allow selection of the file and revision to compare to.
> That copies my momentary methode, but hides the handling of the
> temporary file from the user.

In TSVN trunk, you can use the repobrowser to compare the two urls
directly (trunk and your branch). It will then show you a list of
files/folders which are different between those two urls, and a
doubleclick will open both files in the diff viewer.
But of course, that only really works correctly if you don't have any
local modifications not yet committed in your working copy.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Apr 18 18:52:53 2006

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