[Python-3000-checkins] r65620 - python/branches/py3k

[Georg Brandl]

Brett Cannon schrieb:

>> Sometimes its useful to do one task completely (fix in 2.6, commit, block in
>> 3.0, commit) to make sure you don't miss anything, rather than save all the
>> block commands up to the end.
>>
>> This also keeps the source tree is as consistent a state as possible, so it
>> doesn't matter if Brett gets interrupted while working on his next fix and
>> someone does an svnmerge before he gets back to it.
>>
> 
> Exactly what Nick said. I treat each fix as an atomic commit that
> happens to span to branches in svn. That way I never forget anything.

It's not like we're short of revision numbers. :)

> Plus I have actually been committing when someone else was doing a
> large merge into Py3K, so this helps prevent all of my commits from
> suddenly causing someone else grief.

This is always a problem whenever you merge/commit something to Py3k
while a large merge is done. It could only be helped if the one doing
the merge could somehow lock the branch from other updates.

Georg

-- 
Thus spake the Lord: Thou shalt indent with four spaces. No more, no less.
Four shall be the number of spaces thou shalt indent, and the number of thy
indenting shall be four. Eight shalt thou not indent, nor either indent thou
two, excepting that thou then proceed to four. Tabs are right out.