On Wed, Nov 15, 2006 at 09:16:45AM -0800, Sigbjorn Finne wrote: > I guess an apology is in order from yours truly for having my > hard-drive going bad before getting around to pushing this > back onto HEAD & leaving it to Ian to clean up (thanks!) > Won't happen again...I hope :) > > I also hope that Simon's offer isn't totally serious..
I'm not quite sure what you mean by "Simon's offer", but I think you've misunderstood "stop pushing new patches to 6.6" as "at all" rather than "before pushing them to the HEAD"? > Simon Marlow wrote: > >Sven Panne wrote: > >> > >>The direction of merging is a little bit chaotic in recent times > >>IMHO. In good old CVS days we had the rule that changes from the HEAD > >>should be pushed to the branches where appropriate, not the other way > >>round. It would be good if we used this rule again IHMO, as it makes > >>tracking things easier (by humans, at least). > > > >I don't feel terribly strongly about this, but the reason I've > >committed fixes to 6.6 sometimes is that (a) its sometimes more > >convenient, if I have an up to date 6.6 tree to test on, and (b) it's > >easy to see which patches are in 6.6 and not the HEAD, but we can't do > >that in the other direction. So we'll never forget to merge a patch > >from 6.6 into HEAD, but we will almost certainly forget to merge in > >the other direction. Part of the reason we've had a problem so far is that for some time I didn't realise that people were doing it, so I wasn't making sure the patches got into the HEAD too. Once I've finished merging the outstanding patches to the 6.6 branch I'll merge everything that needs it the other way, and then try to apply them promptly in the future. I think allowing patches to go into 6.6 first is preferable, as if we ban it then I expect we will have more patches sitting around on people's harddrives waiting for when they can make some time to merge them to the HEAD and check they compile before they can push them. Thanks Ian _______________________________________________ Cvs-ghc mailing list [EMAIL PROTECTED] http://www.haskell.org/mailman/listinfo/cvs-ghc
