Important

Those are preliminary instructions which are not very efficient and automated, especially when a branch spans multiple subsystems.

Create a Branch on the SVN Server

$ svn cp svn+ssh://server.com/project/trunk \

svn+ssh://server.com/project/trunk/mybranch

• Or with the Windows TortoiseSVN
  • right-click on your local copy of the original repository
  • select "Branch/Tag..."
  • enter the location svn+ssh://server.com/project/branches/mybranch

Retrieve a Branch to Local Space

• use the usual SVN checkout method

Merge-Back a Modified Branch

Within the branch directory, execute:

$ svn log --stop-on-copy

The log shows the revision from which the branch was created (example: 999)

Change to the trunk working dir.

Update the trunk working dir.

Apply the merge:

$ svn merge -r 999:HEAD \

svn+ssh://server.com/project/branches/mybrach

The files will be modified locally.

Apply additional pre-commint steps (like e.g. passing tests).

Do a standard "SVN commit" with a descriptive message about the merge.

Terminate a Branch

Simply delete the branch.