geoffrey broadwell geoffbroadwellorg tue 20080805 1320 0400 coleda wrote tue aug 5 2008 110 pm chromatic wrote gah maintenance releases please see mommy take five years release new stable version perl 5 bugfix made 2002 perhaps used official term didnt mean lets simplify easily see us needing least dev production branches one trunk one definitely need multiple longlived branches make explicit reasoning data loss security otherwise critical bugfixes backported one already released versions rereleased immediately thats lot harder dont release branches course branch lazily since releases tagged assume multiple longlived branches wont merge go away however im practice branching release stabilize assumedcrazy trunk prefer general way things releases made trunk code kept highquality possible small changes made directly trunk large changes made branch merged trunk ready details may ripe improvement however seems implicit assumption least us merge back trunk even needs nothing affair several scms make easier cherrypick changes branch merge back trunk keep diff even longlived feature development branch small possible git example combined stacked git similar tool decent support altering existing commits branch make easier merge piecemeal dont enough svk fu know well development model supported f tue 05 aug 2008 123550 0700 branching