[petsc-dev] workflow diagram

[Barry Smith]

   It is pretty good. One thing that I don’t think is clear is that the successful testing in next TRIGGERs the branch being merged up to master. I have drawn in an ugly curve which is an example of that. Sadly I couldn’t see how to put an arrow on it nor put text saying something like “successful test leads to merge of branch into master”.


   Also  you use funky unnecessary language that muddles things up.

    red circle    — merge to integration branch      “integration”? Just say next/test branch in fact next should really be called test branch but I guess we are stuck with next

   You waste too much of the page with all the explanation at the bottom. 

   Make the maint and master branch lines blue, the feature lines yellow, the bug fix branch line green, the next branch line red

   The wording (usually start from master) is wrong. It is the branch that is usually started from master not the commit. 

   Remove all the business of “discard when next is rewound words” instead just show the next release being made on the right side of the picture and hence the new next being made again like you do at the left side

   With these changes you can get rid of the last three things at the bottom in () 


   

   
On Apr 30, 2014, at 3:17 PM, Jed Brown <jed at jedbrown.org> wrote:

> Karl Rupp <rupp at iue.tuwien.ac.at> writes:
>> I like the graph pretty much already. Similar to what Barry raised, I 
>> think there is some more room for improvements on the merge arrows. 
>> Rather than allowing merge arrows with arbitrary angles, what about 
>> making them only vertical or horizontal, with corners where needed? For 
>> example, the merge of a feature branch to next and later master could be 
>> depicted as follows (ASCII art works at least in gedit):
>> 
>> --x--------x-------x----------x--- master
>>    \                          |
>>     \                         |
>>       x---x---x-----x--x...A..B
>>           feature          |
>>                            |
>> -------x-------x-----x-----x------ next
>> 
>> 
>> At point (A) the feature gets merged to next, and at (B) it gets merged 
>> to master. Note that the dots are part of the arrow, while dashes are 
>> commit dependencies in the DAG. I think you can keep the coloring and 
>> styles of merge lines to master and next as-is.
> 
> Thanks, updated.  What do you think now?
> 
>> Also make sure you explain in your blog post that the advantage of 
>> feature branches is a clustering of commits which belong together. With 
>> a single 'devel'-branch this is all messy, because commits from the 
>> various features are all mixed up.
> 
> Yup.