CODEWITHSUNDEEP
svnbranch
Tigran
Tigran

Reputation: 62265

Management of branching on Subversion

We need to make a branch on Subverison in these days on our project.

One time branch made, we need to manage in practise 2 projects contemporary. This means, that if we resolve a bug on the branch we should make it also on trunk. First times it would basically easy merging, but more time pass, more trunk will defer from branch, so will be need to make specific fixes to resolve a problem on trunk and on branch.

The problem:

To ensure that none forgets to bring the fix from branch to trunk, I was thinking to write simple program that checks commits on branch, reads a comments and try to find exactly the same comments on trunk. Roughe one.

Is there any more clever solution for this ?

Upvotes: 0

Views: 77

Answers (2)

tripleee
tripleee

Reputation: 189809

The only sane approach is to have automated tests, and fail the build if a test fails. You should perhaps manage the tests outside the trunk/branch distinction, or maybe keep all of the test suite on the trunk, and set up each test case so that it is run in the appropriate branch(es) too.

case $1 in trunk | 2.13branch ) run this test ;; esac

... or probably more like, only skip the test for certain named old legacy branches for which the fix is not supposed to be available.

Upvotes: 1

Ben
Ben

Reputation: 52903

Yes, use svn externals to to ensure the code is identical when it should be and re-build daily: http://www.joelonsoftware.com/articles/fog0000000043.html

Upvotes: 1

Related Questions