[Bf-committers] Modifier stack refactor

Martin Poirier theeth at yahoo.com
Mon Jun 23 23:53:33 CEST 2008


--- On Mon, 6/23/08, GSR <gsr.b3d at infernal-iceberg.com> wrote:

> From: GSR <gsr.b3d at infernal-iceberg.com>
> Subject: Re: [Bf-committers] Modifier stack refactor
> To: bf-committers at blender.org
> Date: Monday, June 23, 2008, 5:49 PM
> Hi,
> theeth at yahoo.com (2008-06-23 at 1431.36 -0700):
> > > With "clean commit policy" I mean,
> split what
> > > it's a modifier bugfix and 
> > > what it's a "refactor bugfix".
> > > 
> > > If you can do that, it's easy for me track
> the commit
> > > and only merge the 
> > > bugfix into the 2.47 branch.
> > 
> > Bugfixes will probably be hard to merge if the code is
> split up.
> > 
> > The refactor can always happen in a new branch (to be
> merged in trunk after 2.47 release) if it would impact 2.47
> too much.
> 
> Or 2.47 bugfixes go to 2.47 branch and new code goes to
> trunk.

That's exactly what we DON'T want to do. That would be the best way to end up with a bug fixes in 2.47 but not in trunk (ie: later versions).

That's why commits in 2.47 are always merges from trunk.

Martin


      


More information about the Bf-committers mailing list