Subversion branch reintegration

Question

When a branch is reintegrated to the trunk, is that branch effectively dead?

Can you make modifications to the branch after the reintegration and merge those back

Answer 1

After you reintegrate from a branch into the trunk, you should do one of two things:

• Delete your branch. This is the easiest, but it makes it harder to see the branch's history.

• Tell your branch not to merge the reintegrate commit. If you reintegrate to the trunk, and commit it as revision X, you can run this command on your branch: svn merge --record-only -c X url-to-trunk. However, you shouldn't do this if you made any changes as part of the commit, other than the merge itself. Any other changes will never make it back into your branch.