> 2008/4/4, Rainer Gerhards <[EMAIL PROTECTED]>: > > > > 999.2.0 - stable > > 999.3.x - big overhaul feature, stabilizing > > 999.5.x - .3 + next focus feature, stabilizing > > 999.7.x - .5 + next focus feature, stabilizing > > 999.9.x - devel > > > > Again... comments please ;) > > I think you really should try to use git feature branches for that. > Have a stable and master (development) branch, and develop the > features in separate topic branches feature-A, feature-B etc. > Whenever one feature is ready, merge it into master. > This way, it doesn't matter which feature you have to concentrate on > is released first (no skipped version numbers!). > The strong merge suppport in git would also allow to cherrypick easily > from the different feature branches or merge between them.
Sounds good, but a honest question (NOT trying to give a bias, just a problem description): While I implement FocusFeatureX, I get Feature 1, 2, 3 requests and implement them - all while FocusFeatureX is being developed. Where do I apply these? And don't I get into trouble if that interferes with things that I do in FocusFeatureX? Remember, I change a couple of hundered lines all over the project on a typical day... Rainer > Cheers, > Michael > > > -- > Why is it that all of the instruments seeking intelligent life in the > universe are pointed away from Earth? > _______________________________________________ > rsyslog mailing list > http://lists.adiscon.net/mailman/listinfo/rsyslog _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog
