On Tue, Dec 8, 2009 at 11:11 AM, Tobias McNulty <tob...@caktusgroup.com> wrote: > On Mon, Dec 7, 2009 at 6:31 PM, Russell Keith-Magee > <freakboy3...@gmail.com> wrote: >> I was thinking more of having one person at the sprint to take the >> role of integrator - that is, the patches still go up on trac, but one >> trusted person at the sprint takes the role of lieutenant for the >> sprint, and selects patches that they consider trunk-ready. The end >> deliverable is a branch that a core developer could theoretically just >> git merge and push to SVN. In practice, there will probably be further >> review by the core, but the idea is to provide a single rich vein of >> high quality patches. > > Yes, personally I don't see the need to be overly organized about > branching for each feature developed at the sprint. There's no need > to dictate what version control system, if any, participants use to > develop code for Django. Some prefer git, some hg, and some small > tickets might not need a branch at all. > > The role of integrator does sound like a good one, though, both in > terms of making sure things work (and work together) and also for > keeping track of what actually gets done at the sprint. Simply > merging that branch directly into trunk sounds a little dicey, > however, as commit granularity in terms of features (even small bug > fixes) is usually a Good Thing.
I should clarify - I wasn't talking about an SVN style merge where N branch commits become 1 trunk commit. I meant a git/hg style merge, where each commit on the branch becomes a commit on the trunk. Yours, Russ Magee %-) -- 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.
