Releases or features: how should branching be done in source control?

So at SlideShare we currently organize our source control branches by release. This works our pretty well (we can work on something that’s a month or two away from being ready, without messing up our ability to deploy other stuff next week).
But one thing I don’t like about this model is that it’s a little inflexible. If one feature on a release is taking more time than was planned, it’s hard (impossible?) to “unbundle” it from the other features and deploy a fraction of a release. In other words, removing a feature from a release is not straightforward.
I’ve heard some shops organized their source control by feature. This seems interesting (it removes the problem I’ve described above) but a little tricky (what’s a “feature”? Does every bug fix have it’s own branch? Seems to bring a lot of subjectivity into the system). Since their are probably several features in a release, this also greatly increases the amount of merging that has to happen to do a release.
Thoughts? Reactions? How are the branches organized in YOUR source control system?
UPDATE: The LinkedIn “Answers” feature rocks! Check out all the thoughtful replies to this question here.

One thought on “Releases or features: how should branching be done in source control?

  1. Mandy August 8, 2007 / 3:30 am

    Hey Jon,
    Well, I am sure everyone follows the basics about working off the trunk and then creating a branch for projects that probably might span over a week or two (or even more).
    However, the point you raise, about working on a branch (with features a, b & c) where a & b are complete but ‘c’ is delaying the release, I would tackle it by creating a flag in the bootstrap file (config file) or something like that and doing development based on it.
    That is, all ‘a’, ‘b’, ‘c’ are developed using
    __FEATURE__A = ‘on’;
    __FEATURE__B = ‘on’;
    __FEATURE__C = ‘off’;
    That way even if C is not complete or fully tested, (hopefully) nothing would be shown to users and won’t break.
    This adds the little extra bit of work (to be handled at controller level) and even though this might not solve all your problems, it might address few of them.
    Let me know what you think.
    Thanks,
    Mandy.

Comments are closed.