Re: [Subclipse-users] Quick merge question

On Jan 8, 2008 4:09 PM, Fournier,Danny [NCR] <Danny.Fournier_at_ec.gc.ca> wrote:
> My structure goes as follow:
>
> /
> /trunk/*.*
> /branch/release3/*.*
>
> I want to put apply trunk to branch/release3, shouldn't the branch URL
> be specified somewhere?

No, the working copy is pointing to the branch.

> If not when does 2 different URL come into play
> during a merge?

You will need that when merging the branch back to trunk. Since the
branch contains changes from trunk and you do not want to merge those
changes back to trunk, when you are ready to merge the branch back to
trunk ( feature branch scenario) you do a final synch of the branch
with trunk. Call this revision N. You then set your working copy to
point to trunk and do a merge where:

From URL = trunk and From Revision = N
To URL = branch and To Revision = HEAD

Of course some types of branches never go back and you do not need to
do this at all.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org