Ticket #1006 (closed enhancement: fixed)

Opened 3 years ago

Last modified 3 years ago

Deprecate stable branch

Reported by: rgrp Owned by: kindly
Priority: major Milestone: ckan-v1.4-sprint-4
Component: ckan Keywords:
Cc: Repository: ckan
Theme: none


Now that we have release branches we should deprecate the stable branch (ie. make sure it is no longer a head and then do --close-branch and merge into default one last time).

Cost: 10m (giving high priority because of low cost)

(Assigning to dread as he has been managing the stable branch).

Change History

comment:1 Changed 3 years ago by dread

This command is slightly different to your branch policy as of two weeks ago:

stable: stable code
metastable: (will soon be deprecated) for code preparing to be stable
default: development HEAD

which I prefer.

My ideal would be to get rid of the confusing name 'metastable' and unneeded 'stable' and start a new branch called 'released', which will act the same as 'master' in this diagram but with a more intuitive name: http://nvie.com/posts/a-successful-git-branching-model

Then for each ckan instance we can either use the most recent release (from 'released') or choose a specific one (e.g. 'ckan-1.3' or even 'default' or 'enh-865' for getting latest features). This gives a good degree of flexibility, is more understandable to newbies and probably a more widely understood branching model.

comment:2 Changed 3 years ago by dread

  • Milestone changed from ckan-v1.4-sprint-2 to ckan-v1.4-sprint-3

comment:3 Changed 3 years ago by dread

  • Owner changed from dread to rgrp
  • Milestone changed from ckan-v1.4-sprint-3 to ckan-v1.4-sprint-4

Reassigning to rgrp for response

comment:4 Changed 3 years ago by rgrp

  • Owner changed from rgrp to kindly

Not sure when i described that other process but I'm definitely of the opinion that we should:

  • Deprecate and remove stable branch
  • Deprecate and remove metastable branch (going forward we can use release branches for what we did with metastable in the past)

May want to update BranchingPolicy to reflect this (also should probably have some statement about closing release branches and tagging)

Reassigning to David Raznick as he is our release guru now.

comment:5 Changed 3 years ago by thejimmyg

  • Repository set to ckan
  • Status changed from new to closed
  • Theme set to none
  • Resolution set to fixed

I'm updating the branching policy now. David has closed stable and closed metastable. Marking as fixed.

Note: See TracTickets for help on using tickets.