[python-committers] state of repo?
sandro.tosi at gmail.com
Fri Apr 6 09:57:51 CEST 2012
On Fri, Apr 6, 2012 at 04:58, Benjamin Peterson <benjamin at python.org> wrote:
> 2012/4/5 R. David Murray <rdmurray at bitdance.com>:
>> I just tried to merge a change from 3.2 to default and found an unexpected
>> file being merged. Looking at the graph, it *looks* like Sandro copied a
>> change to default instead of merging it, even though his commit comment
>> says merge. That would be fine, I'd just do a null merge...except that
>> the file I'm being asked to merge when I try that seems to have nothing
>> to do with Sandro's commits. It is deleting one paragraph and adding
>> another in the threading docs.
> Yes, it seems he didn't actually perform a merge.
I'm sorry about that! I thought I had merged and then edited the
paragraph, but I didn't. Lesson learnt: don't commit when you're dead
Sandro Tosi (aka morph, morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi
More information about the python-committers