Eric Anholt wrote: > 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". >
I just looked at what this does to gitk... J*sus Chr*st, what a mess! I guess in Mesa we're tending towards the opposite approach - to get a clean revision history, avoid merge commits and all sorts of similar "droppings". The mess in gitk is more than ten times worse than stuff I've posted about here in the past to try and avoid, and it's all for 4 lines of changes beyond what has already gone into the repository?!? I don't mind what methodology you use in the X.org repositories, but please don't do this again in Mesa. Keith ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
