[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-18 15:58:58 CEST

Peter McNab wrote:

>Lorenz wrote:
>> Hi,
>>
>> 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.
>>
>> 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.
>>
>> What do you think?
>>
>>
>
>If you have both files resident in WCs then any file diffing tool should
>do the trick.

I know, and that is what I do in the moment, _but_ I only have _one_
of the files in my working copy. The second on I have to go get it via
repo browser, creating a temporary copy, and deleting it afterwards.

The working copy is based on a branch, and I'm merging selected
changes from trunc.

To cross check I'd like to diff files from my working copy against the
analogous file in trunc.

From the file context menu I can diff against base, and via the log
against any previous revision of the file.
What is not possible (as far as I can tell) without doing it by hand,
is to diff a file in the working copy against a random file in the
repository.

>Alternatively, if you fire up the graph and follow the help on diffing
>files you should be able to view them in TortoiseMerge.

Graph as in "revision graph"?
Wouldn't that have the same restrictions as using the files log?
At least finding the file in the graph would be a challenge 8-)

Lorenz

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Apr 18 15:59:43 2006

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