Re: Please stop committing on a broken build! ([Testbot] Plone 5.0 - Python 2.7 - Build # 1925 - Regression! - 6 failure(s))

On 3/24/14, 2:50 AM, Jean Jordaan wrote:
> On Sun, Mar 23, 2014 at 3:37 AM, David Glick (Plone)
> <david.glick-z4DKO/[email protected]> wrote:
>> On 3/22/14, 12:19 PM, Gil Forcada wrote:
>> This falls apart somewhat once you have multiple repositories like we do
>> for Plone. Merging a PLIP usually means merging a number of branches of
>> different packages in sequence. That's necessarily going to break master
>> for a time if there are interdependent changes in different packages.
> Can't it work like this?
>
> 1. Create a PLIPnnn-merged-branch from the trunk.
> 2. Merge all those branches into this branch.
> 3. Make sure the build is green for this branch.
> 4. In case there have been any changes in trunk in the meantime, merge
> trunk to this branch.
> 5. If red, go to 3.
> 6. If we're still green, merge to master.
>
> Apologies if I'm being naïve.
>
No, it won't work. One PLIP may involved branches of 5 different 
packages for example. So either you have to merge those packages to 
their respective master branches in step 2, which could break the 
coredev buildout temporarily if the branches are interdependent; or you 
have to merge them in step 6, with the same problem.


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech