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

Re: Comparing a file in two branches

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Thu, 26 Jun 2008 12:27:55 +0100

2008/6/26 ThePants999 <chris.paterson_at_metaswitch.com>:
> Simon Large-5 wrote:
>>
>> Hold down the shift key when getting the explorer right-click context
>> menu, and you should see Diff-with-URL. That will allow you to diff
>> your working copy with some other branch.
>>
>> Diffing with other revisions on the same branch is easy using the log
>> dialog, but how does PVCS allow you diff two revisions on different
>> branches easily? What's the GUI?
>>
>> Simon
>>
>
> Thanks Simon - at least I don't feel stupid, as that certainly isn't obvious
> :-) Any idea why the need for shift, why not always show the option? It's
> still a bit painful to have to browse right the way down the tree again -
> it'd be nice if, having selected a branch, there was a button to go straight
> to the same sub-path you've got selected under the first branch. But this
> will do for now.

The context menu is already very large, so adding all the extended
options as well would make it huge. One day we may redesign the menu
system to use sub-menus, but for now you get what you get ;-)

> PVCS handles revisions and branches differently. You have only a single
> file, and creating a new branch creates a new revision of that file. If your
> trunk was revision 1.3 and you branched it, you'd create revision 1.3.0.1.
> The next checkin of that file on that branch would be 1.3.0.2, and if you
> branched the trunk file again you'd get 1.3.1.1. It's therefore trivial for
> PVCS to display a tree of all revisions of the file, because they are
> literally one archive file on the server. The GUI displays a tree with the
> trunk and then each branch, which it can do pretty much instantly, and you
> can ctrl-select two revisions to compare.

This is CVS style branching, which makes the sort of history tracing
you describe easy, but renames and tree changes are a nightmare.
Subversion works quite differently in this respect, but as a side
effect you don't have easy access to this info.

> Stefan - thanks, but unfortunately with our enormous revision history, the
> revision graph can take minutes to load :-(

The log message cache in 1.5 should make revision graphs substantially
faster once the messages and revision info have been cached.

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-26 13:28:09 CEST

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