On Tue, Dec 8, 2009 at 12:35 PM, Jeremy Dunck <jdu...@gmail.com> wrote: > On Tue, Dec 8, 2009 at 11:27 AM, mrts <mrts.py...@gmail.com> wrote: > ... >> I have thought about the process a bit and even wrote some >> helper code. >> >> Unfortunately I fell ill and haven't fully recovered (and am >> therefore horribly off-schedule with my work), so I haven't >> had the chance to continue with the effort. >> *Notoriously* bad timing, considering we had a similar >> discussion before and that the sprint is coming up soon. > > Sorry to hear that. The document you linked is a start, but I'm a bit > concerned by this goal: > "to keep the main integration branch as stable as the official trunk > so that it can be used in actual deployments" > > My concern here would be that people become dependent on your > selections for prod, and some of these changes never get merged to > mainline, so that there's functionally a fork in terms of support and > community. > > I guess people will vote with their feet if your queue is really > better. If I do run sprint repos, my specific purpose will be to > provide patchsets for easy integration, but no expectation of people > using those branches for deployment. :-/ > > -- > > You received this message because you are subscribed to the Google Groups > "Django developers" group. > To post to this group, send email to django-develop...@googlegroups.com. > To unsubscribe from this group, send email to > django-developers+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/django-developers?hl=en. > > >
Personally I think merge queues ignore where the real work is. Applying a patch (as a diff, or pulling from another repo myself) is a trivial amount of work, and the number of times I have had actual conflicts between 2 patches that were going to be applied is tiny, and where there was a conflict it usually indicated something more fundamental was wrong with the patch. Because of this work to review tickets, provide feedback, and get them into an RFC state is far more important IMO. Alex -- "I disapprove of what you say, but I will defend to the death your right to say it." -- Voltaire "The people's good is the highest law." -- Cicero "Code can always be simpler than you think, but never as simple as you want" -- Me -- You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-develop...@googlegroups.com. To unsubscribe from this group, send email to django-developers+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-developers?hl=en.
