You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Victor Porton <po...@narod.ru> on 2009/03/23 14:50:35 UTC

Should I delete branches after reintegrate

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

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1390246

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

Re: Should I delete branches after reintegrate

Posted by David Weintraub <qa...@gmail.com>.
You should at least use your pre-commit hook to lock it as read only.
That's what we do. Every once in a while, we will prune old branches
that no one is interested in.

Of course, even a deleted branch isn't really deleted -- just deleted
from the HEAD of that particular revision. You can always find the
data in it, and you can always reactivate it if you discover that you
still need it.

On Mon, Mar 23, 2009 at 10:50 AM, Victor Porton <po...@narod.ru> wrote:
> Should I delete branches after reintegrate? or leave dead branches laying around forever?
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1390246
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
>



-- 
--
David Weintraub
qazwart@gmail.com

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1390629

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

Re: Should I delete branches after reintegrate

Posted by Tyler <ty...@cryptio.net>.
On Mon, Mar 23, 2009 at 05:50:35PM +0300, Victor Porton wrote:
> Should I delete branches after reintegrate? or leave dead branches laying around forever?

You should delete them. I believe that a branch that has been
--reintegrate'd is not particularly useful anyway as it cannot receive
merges. 

There have been several threads about this in the last couple weeks;
look them up in the archives for more details.

hth,
tyler

Re: Should I delete branches after reintegrate

Posted by Greg Troxel <gd...@ir.bbn.com>.
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.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1390403

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