[Python-checkins] r52394 - python/branches/release25-maint/Modules/_ctypes

[Thomas Heller]

Anthony Baxter schrieb:
> On Friday 20 October 2006 17:21, thomas.heller wrote:
>> Author: thomas.heller
>> Date: Fri Oct 20 09:21:26 2006
>> New Revision: 52394
>>
>> Modified:
>>    python/branches/release25-maint/Modules/_ctypes/   (props changed)
>> Log:
>> Initialized merge tracking via "svnmerge" with revisions "1-51333" from
>> svn+ssh://pythondev@svn.python.org/python/trunk/Modules/_ctypes
> 
> Is this such a good plan? Not all patches to the trunk ctypes are going to be 
> suitable for merging into the maintenance branch - new features, for 
> instance, are right out. Or can svnmerge handle only merging some patches and 
> not others?
> 

Yes, it can. 'svnmerge avail' lists available patches as revision numbers.
'svnmerge avail -l' lists the commit messages of the available patches.
'svnmerge block' allows to remove patches from the 'avail' list (because they
are new features).

As I understand so far, it removes the need for the developer to read the output
of 'svn log' in the trunk and in the branch to find out which changes have been
integrated or not.

All in all, svnmerge is simply a tools that makes merging changes (or NOT merging changes)
easier.

For example, I see that this change:

------------------------------------------------------------------------
r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fr, 18 Aug 2006) | 6 lines
Changed paths:
   M /python/trunk/Modules/_ctypes/_ctypes.c

Add asserts to check for 'impossible' NULL values, with comments.
In one place where I'n not 1000% sure about the non-NULL, raise
a RuntimeError for safety.

This should fix the klocwork issues that Neal sent me.  If so,
it should be applied to the release25-maint branch also.
------------------------------------------------------------------------

is a candidate for merging, while this one maybe not (see the other message
on python-dev):

------------------------------------------------------------------------
r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fr, 25 Aug 2006) | 3 lines
Changed paths:
   M /python/trunk/Lib/ctypes/__init__.py
   M /python/trunk/Lib/ctypes/test/test_win32.py
   M /python/trunk/Modules/_ctypes/_ctypes.c
   M /python/trunk/Modules/_ctypes/_ctypes_test.c
   M /python/trunk/Modules/_ctypes/callbacks.c
   M /python/trunk/Modules/_ctypes/callproc.c
   M /python/trunk/Modules/_ctypes/cfield.c
   M /python/trunk/Modules/_ctypes/libffi_msvc/ffi.c
   M /python/trunk/Modules/_ctypes/libffi_msvc/ffi.h
   M /python/trunk/Modules/_ctypes/libffi_msvc/ffitarget.h

Port _ctypes.pyd to win64 on AMD64.


------------------------------------------------------------------------

Thomas