Page History

...

Experimental, complex bug fix, and high-risk change branches

These work like a new trunk. They are created from their intended final destination (trunk for most experimental features, the branch for complex bug fixes). It is the responsibility of the branch creator to merge changes from the original source to the experimental branch as they occur. This may well be at the end of experimental development as one big batch.

As stability is returned, the experimental branch is copied back over the original trunk after confirming all of the changes have been ported to it.TODO

Using svnmerge to manage revisions to merge from the trunk into the release branch

...