[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-17 20:47:56 CET

What happened to the formatting of your message? I will try to decipher
it an respond.

> > Basically, yes. There are exceptions. For example, sometime you will

> > have a long-lived branch where you are using merge to keep the branch
> > synch with trunk. If you do this, you can no longer use the changes
> > the branch itself to produce the diff to send back to trunk. In this
> > scenario, you need to get the branch synched up with some version of
> > trunk.
> Mark, This is an example of where I see that I have a continuing
> mis-understanding of how this works. What is the correct conceptual way
> that one looks at this to know what to do....
> This is what I thought would need to be done:
> If I have a long lived branch and want to get it in sync with the trunk
> would think that all I would need to do is get a working copy of the
> Branch, then get everything that has happened on the trunk since the
> merge from the trunk into the branch. So according to what you said
> earlier I would select the From and To urls as the trunk, with the
> starting revision the revision of the last merge into the branch from
> trunk, and an ending revision being the latest trunk version (or the
> of the trunk).
> If this is not correct then it must be obvious to you what I am missing
> conceptually....

OK, your misunderstanding is that you are describing how you keep your
branch in synch with trunk. If you re-read my reply I am just skipping
over that process because it is the same one we had described previously.
What you describe above is absolutely correct.

The scenario I was pointing out was when it becomes time to merge that
branch back to trunk. Because branch includes changes from trunk, when
you feed Subversion the parameters to produce its "diff" you cannot just
use the start and end revision of the branch because that range includes
all of the changes you merged from trunk (which already exist in trunk).
So what you need to do is get your branch synched up to the HEAD of trunk
one last time and then do a merge where trunk is the from URL and the
branch is the to URL. When Subversion diffs them, it will only see the
differences that are the result of the changes to the branch.


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 Fri Feb 17 20:48:11 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.