[matplotlib-devel] Post-release plans [was: Re: release plans]

Great work everyone with getting the release out!

Now is probably a good time to discuss how the SVN repository will look 
after the release.

My thoughts are below -- any and all concerns or suggestions are 
welcome.  I'm happy to do this work, and will probably wait until next 
week sometime to give the release some time to cool off, in case a major 
stopper bug is discovered in the meantime.  A lot of this is perhaps 
obvious, but it doesn't hurt to be specific ;)

PLAN:

1. Create a new branch based on the release version (I think Charlie 
last put it at r4477), in "branches/RELEASE_0_91_0".  This branch will 
be "locked" to provide a little speedbump to remind us not to commit to 
it.  This branch is useful to have as a point of comparison -- though 
not strictly necessary, since we know the release version on the trunk.

2. Create a new branch based on the head of the trunk, in 
"branches/MAINT_0_x".  This will be used for bug fixes to the 0.x tree. 
  It may get copied into "branches/RELEASE_0_91_1" (or some such) in the 
future, if we want to make a bugfix release without the transforms changes.

3. Setup the svnmerge.py properties so that it is easy to merge bugfixes 
on MAINT_0_x back into the trunk.  (This is the "Merging branches back 
to trunk" case in [1]).

4. Merge "branches/transforms" back into "trunk".  All developers who 
currently have the trunk checked out will transparently be moved to the 
new transforms branch on their next "svn up".

5. Move "branches/transforms" to "branches/closed/transforms" (or 
"closed_branches/transforms", if you prefer).  There are two minds about 
moving or deleting closed branches, but personally, I like to retain 
them to make it easier to find history within the branch.

One possible downside of this plan is with anyone committing while I do 
this.  It's easy enough to lock things while I do all this, but that may 
inconvenience some.  Any suggestions about making the transition 
smoother are welcome.

[1] Svnmerge.py documentation. 
http://www.orcaware.com/svn/wiki/Svnmerge.py#Quick_Usage_Overview

Cheers,
Mike

-- 
Michael Droettboom
Science Software Branch
Operations and Engineering Division
Space Telescope Science Institute
Operated by AURA for NASA