On Wed, 2009-12-02 at 13:00 -0800, Vinson Lee wrote:
> I will commit new bug fixes to mesa_7_6_branch.
>
> What should be done with fixes that were initially committed to
> mesa_7_7_branch?
I would consider just leaving them. Mesa 7.6.2 won't benefit from them,
but it isn't the end of the world
he 7.6 branch,
> and then having the changes flow into master as above?
>
> Keith
>
> From: Ian Romanick [...@freedesktop.org]
> Sent: Monday, November 30, 2009 5:37 PM
> To: Vinson Lee
> Cc: mesa3d-dev@lists.sourceforge.net
> Sub
@lists.sourceforge.net
Subject: RE: [Mesa3d-dev] Mesa (mesa_7_7_branch): mesa: Fix array out-of-bounds
access by _mesa_TexGeni.
It should be straightforward to handle this - it just means merging 7.6->7.7
and then 7.7->master.
Vinson - is there any problem doing your bugfixing against t
On Tue, Dec 01, 2009 at 06:45:44PM +, Keith Whitwell wrote:
> I think where we'd hit trouble is if there were two sets of large
> changes, each of which only one person properly understood. Ideally
> there would be some way to collaborate on merges, but failing that I
> guess one or two people
On Tue, 2009-12-01 at 10:31 -0800, Ian Romanick wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> Keith Whitwell wrote:
> > On Tue, 2009-12-01 at 06:31 -0800, Roland Scheidegger wrote:
> >> On 01.12.2009 11:16, Ian Romanick wrote:
> >>> Speaking of which... there are a bunch of conflict
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Ian Romanick wrote:
> Keith Whitwell wrote:
>> On Tue, 2009-12-01 at 06:31 -0800, Roland Scheidegger wrote:
>>> On 01.12.2009 11:16, Ian Romanick wrote:
Speaking of which... there are a bunch of conflicts merging 7.7 to
master in Galliumland.
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Keith Whitwell wrote:
> On Tue, 2009-12-01 at 06:31 -0800, Roland Scheidegger wrote:
>> On 01.12.2009 11:16, Ian Romanick wrote:
>>> Speaking of which... there are a bunch of conflicts merging 7.7 to
>>> master in Galliumland. Could one of you guys ta
On 01.12.2009 15:35, Keith Whitwell wrote:
> On Tue, 2009-12-01 at 06:31 -0800, Roland Scheidegger wrote:
>> On 01.12.2009 11:16, Ian Romanick wrote:
>>> Speaking of which... there are a bunch of conflicts merging 7.7 to
>>> master in Galliumland. Could one of you guys take a look at it? I have
>
On Tue, 2009-12-01 at 06:31 -0800, Roland Scheidegger wrote:
> On 01.12.2009 11:16, Ian Romanick wrote:
> > Speaking of which... there are a bunch of conflicts merging 7.7 to
> > master in Galliumland. Could one of you guys take a look at it? I have
> > no clue what's going on over there.
> Quite
On 01.12.2009 11:16, Ian Romanick wrote:
> Speaking of which... there are a bunch of conflicts merging 7.7 to
> master in Galliumland. Could one of you guys take a look at it? I have
> no clue what's going on over there.
Quite a few of that was due to the gallium interface changes (introduced
by
On Tue, 2009-12-01 at 02:16 -0800, Ian Romanick wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> Keith Whitwell wrote:
> > It should be straightforward to handle this - it just means merging
> > 7.6->7.7 and then 7.7->master.
>
> Speaking of which... there are a bunch of conflicts me
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Keith Whitwell wrote:
> It should be straightforward to handle this - it just means merging 7.6->7.7
> and then 7.7->master.
Speaking of which... there are a bunch of conflicts merging 7.7 to
master in Galliumland. Could one of you guys take a look
manick [...@freedesktop.org]
Sent: Monday, November 30, 2009 5:37 PM
To: Vinson Lee
Cc: mesa3d-dev@lists.sourceforge.net
Subject: Re: [Mesa3d-dev] Mesa (mesa_7_7_branch): mesa: Fix array out-of-bounds
access by _mesa_TexGeni.
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Vinson Lee wrote:
&g
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Vinson Lee wrote:
> Module: Mesa
> Branch: mesa_7_7_branch
Our agreed process is that bug fixes, especially ones with low
probability of breaking other things, are supposed to go into the oldest
open tree *first*. In this case, and the case of the se
14 matches
Mail list logo
