Re: integration and master divergence

Hi Kieran,

Can you clarify something for me:


On 2012-07-18, at 1:10 PM, Kieran Kelleher wrote:

> Good point, nevertheless, it is just a workflow. Branches and tags are very similar in the sense that they are both generally just "post-it note" references to commits in the object graph, however it is easier for less adventurous users who want to work with source code and still want stable source to have a stable "master" since checking out a tag (detached HEAD and warning message) is not a good user experience, especially for those not living on bleeding edge.
> 
> So, IMHO, we can keep everyone happy by continuing with two branches (just labels on commits) and someone (anyone with commit access) can periodically make a release candidate branch based on master, integrate one-month+ old integration, push it and announce the release candidate via pull request of it to master.

What about the case where that point in time had a bug that was fixed in a later commit, perhaps the next week?  Merging a point in time does not guarantee a working version, just that any bugs in that merge were fixed in a subsequent commit.  Addressing that seems to lead us back to cherry picking the commit.  What am I missing?


Chuck



> 
> Wonder "Users" who want to work with the source (who doesn't want to learn form wonder source?!) can clone and will, by default, get a stable master checkout instead of having to *know* that they need to clone, then go find a stable tag, then make a personal branch based on that and then check that out. Let's keep it easy for Wonder "users" and those less familiar with the layout.
> 
> Wonder "Developers/Contributors" can clone and use integration or whatever they want in between.
> 
> So for the sake of simplicity and less confusion for many users, cloning and defaulting to a stable (master) snapshot makes most sense.
> 
> 
> On Jul 18, 2012, at 3:24 PM, Henrique Prange wrote:
> 
>> 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
> 
> ------------------------------------------------------------------------------
> 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

-- 
Chuck Hill             Senior Consultant / VP Development

Practical WebObjects - for developers who want to increase their overall knowledge of WebObjects or who are trying to solve specific problems.    
http://www.global-village.net/gvc/practical_webobjects









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