[Bioperl-l] branch pruning v.2

[Chris Fields]

On May 14, 2010, at 6:01 PM, Robert Buels wrote:

> Chris Fields wrote:
>> On a related note, going through, it appears the git conversion didn't track merges back to trunk.  For instance, I know the featann_rollback was merged to trunk but it's not showing up.  I know svn had poor merge-tracking prior to 1.5 (where svn:mergeinfo came into play), so it may be hard to actually find true merges w/o that.
> 
> OK, here are all our current branches, I will go through them in order of last-modified date.
> 
> 1998-12-11  bioperl
> 1999-02-19  release-0-04-bug
> 1999-04-13  bioperl-live
> 1999-04-13  stable-0-05
> 2000-01-27  branch-ensembl-m1
> 2000-02-07  internal-branch-pre-delete-06-tag
> 2000-03-22  stable-0-05-new
> 2001-02-19  branch-06
> 2001-11-14  branch-07-ensembl-120
> 2001-12-28  steve_chervitz
> 2002-01-16  branch-07
> 2002-10-22  branch-1-0-0
> 2003-07-07  branch-1-2-collection
> 2003-10-13  branch-1-2
> 2004-10-20  ontology-cache
> 2005-04-14  branch-1-4
> 2006-01-11  bioperl-branch-1-5-1
> 2006-08-14  branch-experimental
> 2007-02-14  branch-1-5-2
> 2007-08-28  featann_rollback
> 2007-11-07  lightweight_feature_branch
> 
> Proposal: move the above to refs/archive and not worry any further about them.  Maybe we can throw them out in 2020.

Just as long as we know they are there.  Rob, can you document the archive set up on the wiki so we don't forget it?

I deleted the featann_rollback branch.  That was a feature branch (no pun intended) to rollback overloading and a host of other changes introduced to bioperl just before the 1.5 release.  It was merged a few years ago in svn.

> 2009-06-17  restriction-refactor
> 
> Proposal: delete, looks like it was merged in a2cb40e6c9c7da4f776dbb72a0266f54320fa37f

This may have been Mark's refactoring, so yes, delete.

> 2009-08-13  TRY_gff_refactor
>  proposal: delete, git claims it is merged
> 
> 2009-08-13  TRY_locatableseq_refactor
>  proposal: delete, git claims it is merged

I deleted these.  The primary goal of TRY_gff_refactor was to work in GFF3 work, but that may rely on FeatureIO so will have to be done in stages.  At some point, if we do a larger scale refactoring of GFF for GFF3 compat we can make another branch.  TRY_locatableseq_refactor will be obsoleted once GSoC starts.  

> 2009-09-29  branch-1-6
>  keep, 1.6 maint branch i think.

Yes.  I will probably work on another set of merges from to 1.6 soon to bring it up to speed, maybe for one last 1.6 release.

> 2009-10-14  anydbm-branch
>  keep, MAJ working.  MAJ, maybe you should move this to topic/ ?
> 
> 2010-01-31  TRY_featureio_refactor
>  keep, but looks dead.  cjfields, maybe you want to delete it?

Yes.  I've deleted this, as FeatureIO is on it's own. 

> 2010-05-12  topic/bug_3077
>  delete, git claims it is merged.

That's already deleted.  Maybe needs to be pruned locally?

> Please review, and I'll do the work if people agree.
> 
> Rob

Good start!

chris