On 11/08/09 3:52, James Turnbull wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Luke Kanies wrote: >>> Thoughts? Doctrinal arguments? >> IMO, 'master' should always be the branch we expect people to submit >> code against, which to me means stable. > > How do we distinguish development branches from stable branches? Of > which we might have multiple - for example 0.24.x, 0.25.x, 0.26.x - > whilst I don't envisage much development on some of these we do need to > be able to go back and say apply a security-related patch. How do we go > back in this model? Check-out a tag? Apply the patch and tag again?
I don't think it is possible to move a tag, it would be as re-writing history which as I understand is what git make sure doesn't happen. >> I think we should move to the often-recreated 'next' branch as we >> discussed, probably with an additional 'dev' branch, so we can try >> code out in one of these branches for a while and remove it if it >> doesn't work (without having to revoke code). > > And you know my thoughts on this - I think it's complex and unwieldy and > I note we rarely have needed to revert code. There are a handful of > instances where we've needed to do this. It also means two separate > methodologies - one for those of us with Git repos and one for > stand-alone patches and diffs (of which there are many). > > I think we need a -dev call to argu^H^H discuss the options. :) And if this call doesn't resolve the issue, Puppet Camp is coming soon. Anyone willing to sponsor a boxing ring :-) Maybe what we need would be a more formal specification (including use case) of the next branch proposal. From there we can see if that works for everybody (casual developper, hardcore developper, and the branch maintainers). -- Brice Figureau My Blog: http://www.masterzen.fr/ --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
