debian package and 0.39_beta thoughts

[Xavier Oswald]

On 22:07 Sun 06 Dec     , Mildred Ki'Lya wrote:
> On 12/06/2009 01:08 AM, Xavier Oswald wrote:
> > The main point is that nobody has to commit to stable, only benoit merge things
> > from master to stable  when a new feature is ready.
> >
> > Doing some stable to master merge get things confusing.
> >
> > A small remember:
> >
> > * master : Where Benoit work and nobody else.
> > * stable : Benoit merge things from master to stable when a feature is ready
> > * name-feature: Everbody can do a branch with a new feature, and then ask Benoit
> >                 to do the merge.
> > * debian : where the debian packaging is
> > * pristine-tar : for debian too
> >   
> 
> Well, merging from stable to master is confusing if you consider that
> everything in the compiler must be implemented in master.
> 
> Now, say that there is an alternate branch provided by one of us. Ben
> would merge it directly to stable when it meets his standards. Then he
> would need to merge from stable to master to get up to date with that
> feature.
> 
> It's something like this:
> 
> name-feature    o---o---o
>                /         \
>               /           \
> stable  -----o--------o----o-------------o---
>                      /      \           /
>                     /        \         /
> master   --o---o---o----o-----o---o---o---
> 
> 
> 
> In this, Ben updates the branch master as he see fit, and merge it into
> stable. In the meantime, there is a name-feature branch being developed.
> When Ben sees this branch ready, he merges it into stable. And to keep
> his branch (master) up to date he has to merge from stable to master. He
> then makes some other changes and merge them again in stable.

I was more thinking of merging name-feature to master and then merge master to
stable. So Benoit will be able to test it according his current development and
maybe adapt some points.

-- 
 ,''`. Xavier Oswald                         | xoswald at debian.org         
: :' : Software Engineer at CALDERA GRAPHICS | http://www.caldera.eu   
`. `'  GNU/LINUX Debian Developer            | http://www.debian.org                
  `-   Isaac Project Developer               | http://www.lisaac.org 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/lisaac-devel/attachments/20091206/0cc3d04e/attachment.pgp>