mesa: Branch 'master' - 50 commits

[Eric Anholt]

On Fri, 2007-03-30 at 23:05 +0100, Keith Whitwell wrote:
> Eric Anholt wrote:
> >  src/mesa/drivers/dri/i965/intel_context.c |    3 +++
> >  src/mesa/drivers/dri/i965/intel_context.h |    1 +
> >  2 files changed, 4 insertions(+)
> 
> Boy, that's a long commit message, but most of the stuff seems to 
> already be in master as individual bugfixes, making it a little 
> difficult to zoom in on the changes that actually change something.
> 
> Presumably git understands it though, as it was able to produce the 
> summary above.  I guess this is another case where the commit scripts 
> could be improved, though maybe it would be cleaner to try and extract 
> out the *actual* changes when doing this kind of merge - would rebasing 
> the external branch against current mesa have made this less verbose?

Yeah, we talked about whether we wanted to push the whole history for
the 3 modules affected, or just condense it down to a couple of patches
and push a clean history.  Many projects, like cairo and the Linux
kernel, do the latter, reflecting not the actual development process but
simply providing a history consisting of nice atomic commits for
changes.  In xorg it seems we've leaned more towards showing actual
development history (no-op merge commits, leaving reversions in branches
rather than rewriting history, etc).  I personally would lean slightly
towards providing clean patches at the end, but keithp and I decided
that in this case with changes that had been intentionally hidden for
some time, it was better to "show our work".

-- 
Eric Anholt                             anholt at FreeBSD.org
eric at anholt.net                         eric.anholt at intel.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
URL: <https://lists.freedesktop.org/archives/mesa-commit/attachments/20070330/851857ad/attachment.sig>