CODEWITHSUNDEEP
svnversion-controlrepository-pattern
QbProg
QbProg

Reputation: 1825

Patches in subversion stable branch

suppose I would like to setup a similar SCM method for my project:

trunk -> unstable development with new features, internally released every tot.

stable 1.0.x -> feature freeze tag 1.0.1 -> patch release tag 1.0.2 -> patch release

suppose I have to do a patch for 1.0.x and then (of course) have it in the trunk too.

it is a common pattern, but I would like to know a good and not time-expensive way to handle the stable branch!

Upvotes: 0

Views: 111

Answers (1)

Kevin
Kevin

Reputation: 25269

presumably trunk has new features not wanted in stable, so it's easier to merge from stable to trunk rather than the other way around. If the affected file(s) haven't been modified in trunk then it doesn't matter which way you do it. If trunk has been completely refactored then obviously merging won't work at all.

Upvotes: 4

Related Questions