[Python-3000-checkins] r56257 - python/branches/py3k-struni/Modules/_ctypes/stgdict.c

[Neal Norwitz]

On 7/13/07, Thomas Heller <theller at ctypes.org> wrote:
> Neal Norwitz schrieb:
> > Should this fix be applied to head (trunk)?  It's easier to make the
> > changes there for stuff like this (assuming that's the case) and let
> > it propagate.   I'll pretty much sync at least once a week.  I have a
> > reminder every Sunday.
>
> Yes it should (as I noted in the commit message).

Sorry, totally missed that.

> What to do?  Shall I apply the fix to the trunk and release25-maint branch,
> and revert it in the py3k-struni branch (to avoid merge conflicts), waiting
> for your merge to happen?  The fix is not very critical since it is in an
> error condition that does not happen normally...

My guess is that the merge conflict will be trivial if it happens at
all.  If you want to be nice, you can back it out, but the most
important thing is to apply to trunk and the 2.5 branch.

Thanks,
n