-----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 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. :) Regards James Turnbull - -- Author of: * Pro Linux Systems Administration (http://tinyurl.com/linuxadmin) * Pulling Strings with Puppet (http://tinyurl.com/pupbook) * Pro Nagios 2.0 (http://tinyurl.com/pronagios) * Hardening Linux (http://tinyurl.com/hardeninglinux) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFKgM7Q9hTGvAxC30ARAsxqAJ9ZQ1KWuOkH+cD2J2lVctlzzAkzQACfb0jZ 9QNBT+q6+LfB50kdsXAK9LU= =NsIN -----END PGP SIGNATURE----- --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
