[petsc-dev] workflow diagram

[Karl Rupp]

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

Thanks, I find it clearer now. Also, the graph looks more structured 
because arrows are not pointing all over the place in various angles.

One more thing: The graph does not contain the case where a feature 
branch has been merged to master, but is soon after found to be buggy. A 
discussion of how this gets resolved (new fix-branch vs. fixing the 
feature branch) is needed as this shows up occasionally in practice.

Best regards,
Karli