Issue #7587 has been updated by Daniel Pittman.
Matt Robinson wrote: > Actually, the release branch names shouldn't be the same as what we'll > eventually tag our releases. For example, 2.7.0 as a branch name is > confusing when we need to make a tag for the 2.7.0 release. I'm not even > sure git will allow a branch name the same as a tag. I am not clear on why we need a release tag when we have a release branch? > Jacob and I talked about naming the release branch more like 2.7.0rc. Then > the rc tags won't conflict since they'll have a number at the end (2.7.0rc1) > and the release tags won't either since they won't have an rc on the end. > Sound reasonable? It seems very odd that the way to run the code that is 2.7.0 is to run `git checkout 2.7.0rc` to me. I don't care deeply, though, and a coherent explanation of why is more than enough to satisfy me. :) ---------------------------------------- Refactor #7587: Git rid of next branches https://projects.puppetlabs.com/issues/7587 Author: Matt Robinson Status: Accepted Priority: Normal Assignee: Matt Robinson Category: Target version: Affected Puppet version: Keywords: Branch: The next branches (next, 2.7.next, 2.6.next) make a lot of merging confusing and so far I haven't heard anyone who objects to their removal. The original idea behind them was from back when developers had just started merging their own code instead of a merge master, and there was concern over code quality. Therefore it was proposed as a compromise to have next be an area developers would merge to, and the merge master would QA the code before it was merged into master. In reality this QA step never happened and developers merging their own code greatly increased velocity and IMHO reduced the bugginess of the code that got merged. The only kink I can think of to getting rid of the next branches is that 2.7.x is currently being used as an RC branch for 2.7.0. We'll need to make an RC branch for 2.7.0 in order to start using 2.7.x for our merges that aren't going in the RC. Other than that we'll just need to merge next branches into their appropriate x and master branches before getting rid of the nexts. -- You have received this notification because you have either subscribed to it, or are involved in it. To change your notification preferences, please click here: http://projects.puppetlabs.com/my/account -- You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-bugs?hl=en.
