[Rivet] Branched release-2-0

[David Grellscheid]

Hi Frank,

>> I branched the release-2-0 branch in the Rivet repository. Please put any
>> new analyses and bugfixes there, and not on 'default'!
>
> Why would we keep committing to the release-2-0 branch, except for
> selected bugfixes that should go into 2.0.x bugfix releases? Or is
> that what you meant here?

That's what I meant. Bugfixes will lead to a 2.0.x release, so they 
should be on the 2.0 branch. The same holds for new analyses (using 
maybe even new projections) that do not need a framework _change_, but 
only add functionality.

However if you change projections or analyses in a non-bugfix way, or 
modify the framework (such as the coming cuts-combiners), those changes 
will result in a 2.1.0 release, so should only happen on 'default'.

>> The 'default' branch is now free again to merge in any completed development
>> features which will belong in 2-1. Progress on release-2-0 should also be
>> pulled into 'default' from time to time.
>
> Is it not typically going to be the other way around: New features go
> into default and are then selectively pulled into release-2-0?

New features go into default, yes. But they will _never_ appear under a 
2.0.x number, so no reason to pull that way.

Also, hg pull cannot selectively pick individual changesets. You always 
get the full tree leading up to that point. That would mean that pulling 
default into release-2-0 brings _all_ of default in. That's not the 
behaviour you usually want.

However, you _do_ want everything that exists in a 2.0.x to continue 
existing in future. That's why you pull from 2.0.x into default.

Is that clearer now? Please keep asking if not!

See you,

   David