[SciPy-Dev] On pulling fwrap refactor into upstream SciPy

[Dag Sverre Seljebotn]

On 02/09/2011 10:11 AM, Dag Sverre Seljebotn wrote:
> On 02/08/2011 10:58 PM, Pauli Virtanen wrote:
>    
>> On Tue, 08 Feb 2011 21:48:28 +0100, Dag Sverre Seljebotn wrote:
>>
>>      
>>> On 02/08/2011 12:09 PM, Pauli Virtanen wrote:
>>>
>>>        
>> [clip]
>>
>>      
>>>> If manual changes are necessary, can they be cleanly separated from
>>>> the automatic boilerplate?
>>>>
>>>>
>>>>          
>>> Not code-wise, but history-wise.
>>>
>>> That is, I have several times changed the code generation of Fwrap,
>>> regenerated the boilerplate, and put the manual changes back in (using
>>> git).
>>>
>>>        
>> [clip]
>>
>>      
> First: Are you sure you are looking at the right branch? There should be
> no *_fc.f files now (if so it is a bug), I did get rid of them.
>
> I'm pushing to Jason's account. I guess I should remove scipy-refactor
> on my account...
>
> https://github.com/jasonmccampbell/scipy-refactor/tree/fwrap
>    

Ah, seems the problem is you looked at the 'refactor' branch. The 
'fwrap' branch is seperate and does not depend on the refactor. ('fwrap' 
is routinely merged into 'refactor', but something has now gone wrong in 
'refactor', will probably be fixed soon.)

Dag Sverre