G'day. This is an FYI, for folks who care about our internal branching and merging process. Most people totally don't need care.
Way back in the dim days of prehistory, when men were men, women were women, and distributed development git was this strange and frightening asteroid on the horizon of the orderly, green fields of software development the development team here at Puppet Labs adopted a process where we would push our day to day changes into the `next` branch, while the more stable `master` branch only got merged to every now and then. This was really motivated by the sort of existential terror that dominated those early days, where we were not confident that we could get it right all the time. We figured that having an unstable branch and a more stable branch would help keep things on an even keel ... or, at least, when we blew things up there were not really the most important things. Turns out our self-doubt was pretty much unjustified. We can keep the system pretty stable, and if we don't getting those bad changes back out is so fast that you wouldn't even believe it. Bam! So, the end of days is here. We are going to get rid of the `next` branch, and the corresponding `2.7.next` branch. Instead, we will be merging our daily development work direct into `master`, `2.7.x` and so forth. RC work will be a separate branch, for the life of the release candidate; look for the `2.7.0rc` branch to see where that goes. We are updating the documentation as you read this, and plan on making the changes to the repository this evening. We don't honestly expect anyone to see a single thing different as a consequence of this, from the outside, since everyone pretty much already develops on the right branches. See http://projects.puppetlabs.com/projects/puppet/wiki/Development_Development_Lifecycle That said, if you do have something against `next` at the moment, wait 'til tomorrow, fetch master, and rebase against that. It should be clean, and more or less just work™. Daniel, for the engineering team. -- ⎋ Puppet Labs Developer – http://puppetlabs.com ✉ Daniel Pittman <[email protected]> ✆ Contact me via gtalk, email, or phone: +1 (877) 575-9775 ♲ Made with 100 percent post-consumer electrons -- 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.
