[Python-Dev] No time for svn merge
musiccomposition at gmail.com
Wed Apr 2 22:55:13 CEST 2008
On Wed, Apr 2, 2008 at 7:16 AM, Trent Nelson <tnelson at onresolve.com> wrote:
> Christian Heimes [mailto:lists at cheimes.de]:
> > Trent Nelson schrieb:
> > > I think holding a developer accountable for merging or blocking to
> > py3k when they commit to trunk is a great idea. Who better to pass
> > judgement on such an activity than the person closest to it?
> > Blocking a revision makes my job as The Merger easier.
> > I'm not so sure about the merging part. It takes some experience with
> > the Python 3.0 code base to know the subtle differences in the C API.
> > Most merges are straight forward for me. If you enforce the forward
> > merging on every developer it may slow down development.
> > Each regular merge takes me about 45 minutes of computer time but less
> > than 15 supervisor time. The computer time is mostly compile and test
> > time in the background. If everybody merges her own code to 3.0 it
> > still takes *everybody* about 10 minutes of time and 45 minutes of
> > time.
> Ah, right, I wasn't thinking about the implication of code affecting the C
> base for some reason, but that's entirely reasonable. Perhaps each
> developer should be accountable for either:
> a) blocking
> b) merging, if they're able to do so
> c) if they're unable to merge, replying to the relevant python-checkins@
> e-mail indicating that they're unable to handle trunk -> py3k for whatever
> reason (e.g. not familiar with py3k code base)
> Other developers could then pitch in and help merge if someone requests it
> via e-mail. I'd think that would make The Merger's life easier.
I think we should let The Merger decide what makes his life easier. :)
> Python-Dev mailing list
> Python-Dev at python.org
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Python-Dev