[petsc-dev] workflow diagram

[Jed Brown]

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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140430/af45217f/attachment.sig>