Re: integration and master divergence

Hi all,

I agree that the separation of master/integration is pointless as soon as we keep creating tags every month. The integration branch is intended for people that want the latest changes. Anyone wanting a more "reliable" approach should point to a tag. The master branch adds no value.

Just my two cents.

Cheers,

Henrique

On 18/07/2012, at 14:54, Ramsey Gurley wrote:

> 
> On Jul 18, 2012, at 5:25 AM, Kieran Kelleher wrote:
> 
>> On Jul 18, 2012, at 6:21 AM, Maik Musall wrote:
>> 
>>> 
>>> 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?
>> 
>> It is about one month better than we had in the old days of svn trunk.
>> 
>> If a few people want to have master lag integration by two months, or some other time period, instead of one month, that's fine by me too.
> 
> FWIW, I don't use master in my personal projects anymore. One reason is cherry picking. I can't tell what's in master anymore. It sounds like we're fixing this. 
> 
> The other reason is master is a month behind integration. I'm not sure how we fix that, but master is useless to me when it's that far behind current patches.
> 
> Ramsey
> ------------------------------------------------------------------------------
> 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/_______________________________________________
> Wonder-disc mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/wonder-disc

------------------------------------------------------------------------------
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/

_______________________________________________
Wonder-disc mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wonder-disc