2009/10/14 demerphq <demerphq@gmail.com>: > 2009/10/14 Nicholas Clark <nick@ccl4.org>: >> On Wed, Oct 14, 2009 at 03:43:12PM +0200, Rafael Garcia-Suarez wrote: >> I still prefer not to bump the maint version *early*. >> Because the extra "I'm special" isn't in $], and I'm confident it will get >> lost at times, for example as happened with "5.8.1", which wasn't 5.8.1. >> >> I see no reason *not* to bump the devel version early. >> >> >> So I'd prefer your diagram to be: >> >> * <- tag v5.12.0 >> | >> |------------------------------------------\ >> | | >> * bump blead version to 5.13.0 | >> | [do this immediately. | >> | thou shalt not branch until | >> | it's done] | > > I think this is not realistic. And to make it realistic you have to do > a lot of extra work. Which doesnt make sense to me. > > Consider. v5.12.0 is released. now a minor doc fix is applied. > Presumably the doc fix applies as much to the 5.13.0 as it does to the > 5.12.1. So that commit will be in both branches. That can be > accomplished by simply appling the commit to blead, and then merging > the 5.12.x maint branch. No: we can't merge blead into maint, because blead contains commits not suitable for maint. We can, however, use feature branches, and merge (or rebase) those branches in blead and maint.Thread Previous | Thread Next