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

Re: [Subclipse-users] Another general subclipse question

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-02-18 16:50:00 CET

> This is where I am confused now. I have a WC of the head. The head has
> nothing at all from the branch, the branch has everything from the
> The from URL is the trunk? (which revision? the one when the branching
> began? The To URL is the branch... (the revision being the last revision
> the branch??? )

Just remember that you are feeding Merge two URL/revisions that it is to
use to produce a diff and apply to your WC. So in this final scenario, the
from URL would be trunk @ HEAD (or more exactly the last revision that you
had synched the branch to). and the to URL would be the branch @ HEAD.

Since the branch has been synched up to the HEAD of trunk, the diff you
want is between trunk and branch @ HEAD. This should just be the
differences for the branch itself.


Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Sat Feb 18 16:50:14 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.