On Fri, 20 Aug 2010 at 21:58:16 +0400, NIR Ginko wrote: > Ok. Thanks. I have one question: What's the difference between > "master", "cairo" and "next" branches?
'master' is supposed to be the stable version containing only the patches which survived some testing. It's also the branch where git commit ids will never change (ie it's never rebased), so when people refer to some id like a78cff4e7f478fec5b489d40ff8df0bd618bc214 it has a permanent meaning, and people in the future will know exactly what that was refering to. 'next' is the branch where things are uploaded just to "see what happens". So if someone sends me a patch which is not outright crazy, it is pushed to 'next' in the hope that people lurking in this mailing list will complain if they see something wrong and/or test it themselves. That's what just happened to your russian patch. 'next' can be rebased in the face of screw-ups, e.g. to merge a fix into the patch which introduced the bug etc. 'next' is also the branch which I personally use and test. 'cairo' is a branch with some work in progress by Johann Haarhoff to replace wmaker's own routines by the ones provided by the library called cairo (http://cairographics.org/) -- To unsubscribe, send mail to [email protected].
