[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: Tue, 8 Jan 2008 15:59:04 -0500

On Jan 8, 2008 3:51 PM, Fournier,Danny [NCR] <Danny.Fournier_at_ec.gc.ca> wrote:
>
> Here's an idea of the revision history:
>
> ...
> 408: Branch (Release3) from trunk @ 406
> 406: Some comment here
> ...
>
> I then setup the merge as follow:
>
> From: Branch (Release3) Rev 408
> To: Trunk Rev 406
>
> When I do a dry run, nothing is found. However, if I use head for the
> branch, then I get some files.
>
> Basically, trunk was updated and the branch should have the updates
> applied to it as well.

In Subversion, merge is basically a fancy version of create diff +
apply patch. The input to the merge is the value it takes to produce
the diff you want to merge. The working copy is where it is applied.

So you need a working copy pointing to the branch. Your From and To
URL should be trunk. The from revision should be 406 and the to
revision should be HEAD.

-- 
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-08 21:59:12 CET

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.