Re: integration and master divergence
Maik Musall <[email protected]>
| Newsgroups | gmane.comp.web.webobjects.wonder-disc |
|---|---|
| Message-ID | <[email protected]> |
Am 18.07.2012 um 12:12 schrieb Pascal Robert: > Le 2012-07-18 à 05:45, Maik Musall a écrit : >> Am 17.07.2012 um 19:22 schrieb Kieran Kelleher: >>> The original plan with integration was that commits that survived for at least a month in integration without >>> breakage or bugs would be deemed worthy of merging to master. >> >>> If all goes well, this merge will be shifted to master and then we can from then on ONLY merge integration commits that are a month old PERIODICALLY (1-4 weeks intervals). >> >> As I see it, master should be a stable thing that production apps can rely on. That requires two premises: >> >> 1. An integration test of the periodic merge to make sure everything works fine with everything else after merging stuff that nobody was running in exactly that combination before. > > Right now, the test is that most of us are using integration branch. Most Wonder committers use integration as their primary branch, and I know that other people use it to. That also means that nobody has used exactly that one month old integration commit for longer than until the next commit came in, right? Is that a sufficient basis for stability? >> 2. Some sort of version number to tag each release, so that it will be possible for everyone who experiences problems in production can easily switch back to the previous master release. Every other framework out there has version numbers that make it possible to refer to a specific release. > > Already done. All commits done in master, except a couple of small ones, coming from integration have been tagged. > > https://github.com/projectwonder/wonder/tags > > We even have a change log for master: > > https://github.com/projectwonder/wonder/wiki/Changelog Oh, I somehow missed that, thanks. Maik ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/