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.
Can someone sort this out, please? It's currently beyond my knowledge
of hg to do so.
Thank-you for submitting your contributor agreement. Your online profile on
the PSF bug tracker has been updated to show that you have a contributor
agreement on file with us.
On Tue, Apr 3, 2012 at 8:31 AM, Andrew Svetlov <andrew.svetlov(a)gmail.com>wrote:
> Looks like easier to fill that form again.
> Please see attachment.
> On Fri, Mar 30, 2012 at 12:57 AM, Pat Campbell <patcam(a)python.org> wrote:
> > Hi Martin:
> > Well, Kurt will get the contributor agreements that were collected
> > at PyCon 2012 to me. I am cc'ing him on this email.
> > Thanks,
> > Pat
> > On Thu, Mar 29, 2012 at 5:35 PM, <martin(a)v.loewis.de> wrote:
> >>> Okay, regarding your contributor agreement, I have cc'd Martin. If
> >>> he has it, then there should be no problem with him forwarding it
> >>> to me.
> >> I gave a bunch of them (including Andrew's) to Kurt Kaiser.
> >> Regards,
> >> Martin
> > --
> > Pat Campbell
> > PSF Administrator/Secretary
> > patcam(a)python.org
> Andrew Svetlov