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.
At least in the case I assume you're referring to, it would have been more or less the same problem with cherry-picking, as the indentation of the GLX code is different between branches. I think the lesson there is to resist the temptation of whitespace-only changes, no matter how much 'better' the result may appear. -- Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer ------------------------------------------------------------------------------ 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
