Afin de faciliter la correction de bugs dans plusieurs branches, il peut être intéressant de mettre en place svnmerge.

svnmerge is a simple tool that tracks Subversion branch merges. It stores the repository path for each merge source ("trunk") along with the list of already-merged revisions in the svnmerge-integrated property associated with the destination ("branch/stable") directory.

You can think of svnmerge as the equivalent of yellow sticky notes on a subversion branch that record which revisions have been merged in already from one or more heads, plus some useful functionality for managing and updating that information.

This tool does not commit any changes so it is you who decides to commit merges or revert changes after a accidental merge.

Référénce :

• http://www.orcaware.com/svn/wiki/Svnmerge.py