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

Re: [Subclipse-users] Quick merge question

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 9 Jan 2008 07:33:20 -0500

On Jan 9, 2008 7:24 AM, Fournier,Danny [NCR] <Danny.Fournier_at_ec.gc.ca> wrote:
> > -----Original Message-----
> > From: Mark Phippard [mailto:markphip_at_gmail.com]
> > Sent: January 8, 2008 4:13 PM
> > To: users_at_subclipse.tigris.org
> > Subject: 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.
>
> So:
>
> - right click on branch local copy
> - Team > Merge
> - From trunk 406
> - To trunk HEAD
>
> This would apply trunk to branch to my local copy, then I can commit the
> changes to branch repo?

Yes. That would produce a diff of trunk between r406:HEAD and apply
it to the working copy.

-- 
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
Received on 2008-01-09 13:33:35 CET

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