Re: Problem with merge and --reintegrate

On Fri, Jul 24, 2009 at 03:04:06PM +0200, Rickard Lindberg wrote:
> > One question though. Surely you'll want to cherry pick from the
> > trunk occasionally? What if someone fixes a bug there during general
> > dev that's appropriate for the release?
>
> Ya, I guess. We just haven't done it yet. On the other hand, if you are
> supposed to fix a bug, isn't it better to fix it in the oldest maintained
> branch and then merge it back intro trunk from there?

There's no rule about this unless you make one up.

In Subversion itself all changes enter the code base through trunk.
We then do backports to the release branches. See this file for
a bit of insight on how this works (every change needs 3 votes to
go in): http://svn.collab.net/repos/svn/branches/1.6.x/STATUS

Stefan
Received on 2009-07-24 15:53:55 CEST