On Wed, Mar 14, 2012 at 2:10 PM, Georg S. Weber <georgswe...@googlemail.com> wrote: > On 14 Mrz., 20:43, Jeroen Demeyer <jdeme...@cage.ugent.be> wrote: >> On 2012-03-14 19:20, Keshav Kini wrote:> If we switch to git, as I >> understand we eventually will, patches >> > (commits) made from an older dev release will be considered to "not >> > apply" (not be mergeable) a lot more often than merely the cases when >> > other people have meanwhile touched the same files - in fact, *always* - >> > unless we make development releases based on their predecessors. >> >> If this is true, then I don't want to switch to git. > > (... scatches his head ...) > If this was true, how could Torvalds and coworkers possibly use "git" > as a (distributed!) version control system tool for developing the > Linux kernel? > > To my understanding they have "lieutenants" responsible for different > areas maintaining their own kernel tree each, and Linus Torvalds then > pulls in the requested changes from each one. Or not. Or maybe later, > partly, etc.pp. This must be a highly non-linear process! And git was > *designed and created* (by Linus Torvalds himself!) to support this as > easily and smoothly as possible.
The non-linearity is handled by branching and merging. For example, one could branch 5.0.alpha0 off of 4.8.beta1. Then when 4.8.beta2 comes along (which may roll back an problematic patch/spkg) it (meaning all the changes between beta1 and beta2) could be merged into 5.0.alpha1 (along with whatever other development happened in that branch). All of this lives in the revision control system (including, ideally, spkg versions and metadata) so that one could do "git checkout 4.8.beta2" to get/test/rebase against this version of Sage (or even better, work off of head without having to wait for official releases to be cut and then rebasing). - Robert -- To post to this group, send an email to sage-devel@googlegroups.com To unsubscribe from this group, send an email to sage-devel+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
