Ian Romanick <i...@freedesktop.org> writes:
> Keith Whitwell wrote:
> > On Thu, 2009-09-03 at 15:13 -0700, Michel Dänzer wrote:
> >> On Thu, 2009-09-03 at 14:43 -0700, Ian Romanick wrote:
> >>> 2. It becomes increasing difficult to merge (as opposed to cherry-pick)
> >>> from one branch to the other as the branches diverge. Michel has run
> >>> into this.
[snip]
> > There are a couple of points in favour of the periodic merge approach,
[snip]
> >>From that point on, it is natural to want to be 100% sure that bug-fixes
> > have been preserved, and periodically merging the 7.6 branch to master
> > guarantees that none of those bugfixes will be lost/forgotten.
> >
> > This doesn't prevent people who want to work a different way from
> > developing bugfixes on master and cherry-picking them to stable, but
> > it's not a natural workflow for the case where a bug is spotted on
> > stable and needs to be fixed on stable.
>
> That depends entirely on whether or not the bug also exists on master.
[snip]
> The natural work flow is [. . .]
FWIW, git includes an overview of how git.git runs in gitworkflows(7).
It describes a system where bugfixes are applied to the oldest possible
location in history, and graduate upwards (towards instability).
Cherry-picks are still used for the occasional mistakes that get
applied to unstable places but should be stable. Sounds like this
would require more discipline on the part of developers.
Not that I'm going as far as to advocate their approach, but it does
have the benefit that we know it works... else we wouldn't be having
this discussion ;)
-tom
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
