Re: [Subclipse-users] Another general subclipse question

Thanks Matt.... so now I am down to the final step.... The merge of the
branch back into the head. I read your response a number of times and drew
out the the scenario on paper....

The trunk was marching along in time.... The branch was doing the same..
Periodically merges were done from the trunk into the branch keeping the
branch up to date with the head. Each time this was done the revisions were
bumping and needed to be remembered so that when the branch got a merge from
the head we knew what revision numbers to begin with (so as not to got
changes from the head that were already in the branch.

So now we want to get the branch into the head. As you said we do a final
merge from the head into the branch first. Now the branch has all of it's
stuff plus everything that has gone on in the head since the branch was
first branched off the head (trunk).

For this last step you describe..... I would get a WC of the trunk and then
attempt to merge the branch into the head.... ultimately ending with both
the branch and the head being identical.... (at least for a few minutes)..

I am confused at this last step.... The branch has all of the trunks changes
in it.... The trunk has none of the branches.... If you don't mind... (I'm
sure after this I will get it....)

You said.....

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.

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 head...
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 on
the branch??? )

If you could expound on this last step a little more it would be greatly
appreciated...

thanks,
Ed

--
View this message in context: http://www.nabble.com/Another-general-subclipse-question-t1140832.html#a2997149
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