[annotator-dev] Branching v2.0.x
tilgovi at hypothes.is
Wed Oct 30 17:50:02 UTC 2013
Fine to treat master as v2.0.x here. I'll kill the branch for now.
On Oct 30, 2013 2:13 AM, "Robert Casties" <casties at mpiwg-berlin.mpg.de>
> On 30.10.13 09:22, Nick Stenning wrote:
> >> I would like to propose that maintenance fixes only land on v1.2.x.
> >> We should make a release there shortly with anything that's landed
> >> since the last tag.
> >> We should aim to land Nick's WIP branch on v2.0.x.
> > Agreed, but this now leaves us with three branches -- master, v1.2.x and
> > v2.0.x. I think we only need two at any one time, and my preference
> > would be to fork v1.2.x immediately after releasing 1.2.8, and then
> > merge in the wip branch and have master become the unstable 2.0.x
> > development branch.
> I would prefer this solution too since its what I would assume from a
> development project - checkout trunk at your own peril - but maybe I'm
> just old school ;-)
> >> I wanted a way to start landing changes upstream without worrying
> >> about v1.2.x compatibility. That way we don't have to land the WIP
> >> branch with tons of other changes and call it v2.0.0 immediately. We
> >> can iterate to v2.0.0 but things can be landed instead of staying on
> >> side branches indefinitely.
> Great, keep the new stuff coming.
> Dr. Robert Casties -- Information Technology Group
> Max Planck Institute for the History of Science
> Boltzmannstr. 22, D-14195 Berlin
> Tel: +49/30/22667-342 Fax: -299
> annotator-dev mailing list
> annotator-dev at lists.okfn.org
> Unsubscribe: http://lists.okfn.org/mailman/options/annotator-dev
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the annotator-dev