[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: Lorenz <lorenznl_at_yahoo.com>
Date: 2006-04-19 08:06:31 CEST

Stefan Küng wrote:

>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.

I should have mentioned the local mods because there that's my
problem. I'm doing a merge to a branch wc, and afterwards my program
no longer works correctly. As the merged-in feature work on trunc, I
want to diff some of the files, modified by the merge, to trunc, to
see what's missing (perhaps one of the previous trunc revisions that
where not merged contained a prerequisite I didn't recognize).

As I think I could use the proposed feature regularly in the future
(well, thats perhapse my own fault, but ... 8-), I'm very interested
to see it being included in TSVN (sorry, no chance to do it myself, as
I'm not familiar with programing windows applications at all)

On the other hand, if it's only me that is interested in the feature,
I don't think it would be to difficult to come up with a sript for my
workaround.

If you see a chance to implement it, but need some more convincing,
let me know 8-)

Lorenz

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Apr 19 08:07:07 2006

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