[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Should I delete branches after reintegrate

From: Greg Troxel <gdt_at_ir.bbn.com>
Date: Mon, 23 Mar 2009 11:30:21 -0400

Should I delete branches after reintegrate? or leave dead branches
  laying around forever?

Probably depends on the details in your documented software process :-)

But, if it was a feature branch, and it's been reintegrated, then I
think there are only two reasonable choices:

  do a record-only merge of the merge-to-trunk onto the branch, making
  it safe to do more work on the branch and later reintegrate that

  delete the branch, thereby declaring that no more changes should be
  made on it and it's really done with.

The last option

  leave the branch, and hope no one commits to it

seems like trouble waiting to happen.

I hope this helps clarify the issues; there is no right answer but you
have to consider what it is you want to do.

In my project, feature branches are deleted, and long-term project
branches (to let two projects each have a trunk) use the record-only
reverse-mege strategy.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

  • application/pgp-signature attachment: stored
Received on 2009-03-23 16:32:30 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.