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

Re: Merge tracking question

From: Purple Streak <mrpurplestreak_at_googlemail.com>
Date: Mon, 10 Nov 2008 12:24:39 +0000

2008/11/7 Bob Archer <Bob.Archer_at_amsi.com>:
> What about the situation where I have a release branch and I want to merge
> in any changes made to that back into trunk… but I don't want to merger stuf
> from trunk into the feature branch. Here's my example…

> Now, I want to merge changes from the v6.0 branch into trunk. Is this as
> simple as doing an svn merge /branches/v6.0 in the /trunk working dir?

Here your merges are all one-way - i.e. you branch and then you want
to copy from one to the other so I would assume it would just be a
merge as you say - and then further fixes could come along later and
be merged. I think it would get tricky if you then wanted to apply a
fix made it trunk to a the feature branch though and I don't know what
would happen here.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-10 13:25:08 CET

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