[petsc-dev] workflow diagram

[Jed Brown]

Satish Balay <balay at mcs.anl.gov> writes:

> On Wed, 30 Apr 2014, Jed Brown wrote:
>
>> Satish Balay <balay at mcs.anl.gov> writes:
>> > BTW: instead of associating 'discard when next is rewound' to the
>> > dotted arrows - I'll suggest using the same 'merge' arrow notation here.
>> 
>> I wanted to indicate which parts of the graph remain in permanent
>> history and which parts are only temporary.  I changed 'next' to a
>> dashed line to further reinforce this.
>> 
>> > And then somehow show that the 'next branch is discared and
>> > reconstruced (from master) at the next release..
>
> Here is my attempt to show the release dynamics better..
>
> https://docs.google.com/drawings/d/1kMHa7O6FB5iiJG5QPTWqlMne1xv17A6jOXXyQ_74kaE/edit?usp=sharing

Hmm, feature releases are in first-parent history of both 'maint' and
'master'.  We tag a release on 'master', then do a fast-forward merge of
the release tag into 'maint'.
-------------- 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/11024b6b/attachment.sig>