On Jul 29, 2012, at 2:41 PM, Luke Kanies wrote: > On Jul 28, 2012, at 2:04 PM, Ken Dreyer <[email protected]> wrote: > >> I recently opened my first pull request [1], against master. After >> re-reading CONTRIBUTORS.md I see that Puppet prefers to merge bug >> fixes into the earliest branch first (eg 2.6.x or 2.7.x), rather than >> master first. I thought this might be a problem for my merge request, >> and so Dominic in IRC suggested that I re-submit a new merge request >> against an earlier branch instead. Ouch. > >> 3. Reduce effort for the bug fixers: if a casual bug fixer only cares >> that it's fixed "eventually", he or she can get it into master, and >> then backport when he or she has extra time available. With the >> current submission model, the submitter must make an effort to get it >> into an old branch, plus the effort to get it "up" into master, or >> else risk having his or her fix disappear in new major releases. >>
The submitter doesn't have to make sure it gets up into later branches. We take care of that. >> 4. Help reduce confusion for newbies like myself :-) Can you help me understand what caused the confusion? I seems like the policy is fairly straightforward (the earliest of the open branches). I can maybe see how it might be hard to know what the open branches are, but are there different problems that you encountered? > > Those are definitely the most compelling reasons for me - I know Andy Parker > and the team is working hard to make it easier to contribute. I'd look to > him to comment on whether this can be changed, since it's in their court now. I can definitely understand how a rule of "just target master" would really help reduce confusion for contributors. On the other hand in order to fix a problem, you really need to know where the problem lies. What version of the code shows the issue, that is the thing that needs to get fixed. Having everything targeted at the same branch would probably end up causing a lot more problems on our end related to getting code into the right places. > > -- > Luke Kanies | http://about.me/lak | http://puppetlabs.com/ | +1-615-594-8199 > > -- > You received this message because you are subscribed to the Google Groups > "Puppet Developers" 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-dev?hl=en. > -- You received this message because you are subscribed to the Google Groups "Puppet Developers" 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-dev?hl=en.
