Delete branches after reintegrate in 1.6?

[we...@tigris.org]

In Subversion 1.6, do we still need to delete a branch after it has been reintegrated into the trunk? The manual only mentions 1.5, but not 1.6:

"In Subversion 1.5, once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work. It's not able to correctly absorb new trunk changes, nor can it be properly reintegrated to trunk again. For this reason, if you want to keep working on your feature branch, we recommend destroying it and then re-creating it from the trunk."

- http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync

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

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

Re: Delete branches after reintegrate in 1.6?

[Stefan Sperling <st...@elego.de>]

On Sun, May 17, 2009 at 09:08:44AM -0700, webpost@tigris.org wrote:
> In Subversion 1.6, do we still need to delete a branch after it has
> been reintegrated into the trunk? The manual only mentions 1.5, but
> not 1.6:
> 
> "In Subversion 1.5, once a --reintegrate merge is done from branch to
> trunk, the branch is no longer usable for further work. It's not able
> to correctly absorb new trunk changes, nor can it be properly
> reintegrated to trunk again. For this reason, if you want to keep
> working on your feature branch, we recommend destroying it and then
> re-creating it from the trunk."

That should probably say "In Suversion 1.5 or later ..."

In general, if the book talks about 1.5, you can assume that what
it says also applies to 1.6. But not to 1.4.

Stefan