[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: etornick <etornick_at_comcast.net>
Date: 2006-02-17 20:30:53 CET

Mark Phippard wrote:
> etornick <etornick@comcast.net> wrote on 02/17/2006 10:28:32 AM:
>> So the big point I take away from this is that in merging from the
> Branch to
>> the trunk into my local working copy I got from the trunk, the URL I
> should
>> use in the from and to part of the merge dialog will be the branch. I
> never
>> would have to use the trunk URL when merging a branch into the trunk.
> Basically, yes. There are exceptions. For example, sometime you will
> have a long-lived branch where you are using merge to keep the branch in
> synch with trunk. If you do this, you can no longer use the changes on
> 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 I
> 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 last
> 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 the
> trunk, and an ending revision being the latest trunk version (or the head
> of the trunk).
> If this is not correct then it must be obvious to you what I am missing
> conceptually....
> Thanks,
> Ed
> When you do the merge, you then specify trunk as the from URL and
> the branch as the to URL with the appropriate revisions of each based on
> the revision of trunk you were synched to. Subversion will then be
> diffing trunk and the branch to figure out what is different on the branch
> to apply to the WC.
> Mark
> _____________________________________________________________________________
> 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

View this message in context: http://www.nabble.com/Another-general-subclipse-question-t1140832.html#a2995740
Sent from the subclipse - users forum at Nabble.com.
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:33:40 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.