Re: Branching for V2.2

On Tue, Jul 23, 2013 at 11:36 AM, Christian Van Brussel
<[email protected]> wrote:
> I would like to commit some code but wouldn't want to have it included
> in CS 2.2 because it is not ready yet and would still require a lot of
> work.
>
> Would it be possible to create the 2.2 branches?

Standard version control practice is to create a development or
work-in-progress branch for unfinished work, and then merge that
branch into trunk when it has matured sufficiently. Rushing creation
of the 2.2 branch just to avoid polluting 2.2 with some unfinished
code seems like an abuse of this principle.

Ideally, 2.2 should be branched when trunk is at an ideal state to
make a release (regardless of the state of any work-in-progress
branches), and then the release should be made very, very soon after.
Previous releases have been quite problematic due to the time elapsed
between branching for the release and making the actual release. It
has not been uncommon for 6-12 months to elapse between branching and
releasing, during which time tens or hundreds of changes had to be
back-ported from trunk to the release branch. The situation has not
been ideal.

(Granted, SVN is not strong at branching and merging, so it's harder
than it sounds. A version control system, such as git, which makes the
process easier would be welcome.)

-- ES

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk