-----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 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 width0 branch merge). It will get only worse when I merge >> gallium-noblocks branch (not quite there yet). Those changes are fairly >> intrusive as those API changes affect a lot of files/code. > > They were pretty minimal really - but there was some knowledge required > of what is "new" and what is "old". It's not much fun resolving > conflicts in code you don't know about, but the conflicts themselves > weren't onerous.
I figured as much. Linus gave a good talk at Plumbers this year about dealing with merge issues like this. I attended, but I didn't take good enough (read: any) notes. :( -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAksVYOUACgkQX1gOwKyEAw8bEwCZAeW9T1bK145GMUlOa3BQY1sE GMAAoIyx7lYyt0/O0aQJaquGaEWxsW1D =59CY -----END PGP SIGNATURE----- ------------------------------------------------------------------------------ Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
