dolfin team mailing list archive

[Florian Rathgeber <florian.rathgeber@xxxxxxxxx>]

On 26/03/13 16:11, Anders Logg wrote:
> On Tue, Mar 26, 2013 at 04:04:27PM +0000, Florian Rathgeber wrote:
>> On 26/03/13 15:55, Garth N. Wells wrote:
>>> On Tuesday, 26 March 2013, David Ham wrote:
>>> 
>>> Hi All,
>>> 
>>> I imagine that Florian will have something to say about this,
>>> but the ffc pyop2 branch may be an issue here.
>>> lp:~mapdes/ffc/pyop2
>>> 
>>> 
>>> This may be fine because I don't believe that we're planning
>>> to prune/rewrite the FFC history at this stage (I think that
>>> it's required, but it's easier to delay until later compared to
>>> the DOLFIN repo). We need Florian to tell us if this will
>>> work.
>> 
>> As I mentioned earlier there is also the route of importing the 
>> feature branch into the non-filtered repository (where the marks
>> files are "intact") and then transplanting the branch (with all
>> its history etc.) to the rewritten repository via a git rebase.
>> It's a bit more laborious and you should know what you're doing,
>> but I've done it before. We've rewritten both the OP2 and the
>> PyOP2 repositories halfway through the project. It's just not
>> something I would want to ask a git novice to do by themselves.
> 
> I would say it's up to you. I don't care much about the history of 
> feature branches and no one else has indicated that it is important
> to provide a route for converting feature branches. So if it is
> important to the ffc/pyop2 branch, I can follow your instructions.
> 
> But I would assume that requires merging the ffc/pyop2 branch
> *now*, before the conversion, and it might not be ready?

No, I can do that later. The reason the branch isn't quite ready is
that we don't (yet) have tests for the features we're adding so it
would be hard for the FFC developers to notice if they break anything
for us post merge. We're passing the existing FFC test suite though.

But there is another option to get round the entire problem: simply
importing *all* feature branches before doing the filtering. That
should (unproven claim, I'll need to read the docs) be scriptable
through the launchpad API and the branch import script that I've
already written. But I was assuming you didn't want to necessarily
migrate all the branches, so I didn't focus on this option in prior
discussions.

> For the FFC branch, I would like to strip out all the old .h
> reference files. Then add them back again right after the
> conversion.

That is certainly doable, but so far my impression was that Martin
objected to this plan?

Florian

> -- Anders
> 
>> Florian
>> 
>>> Garth
>>> 
>>> 
>>> I would imagine that merging this will, at least, require 
>>> discussion. The relevant people are likely to be less around
>>> for the next couple of weeks due to Easter.
>>> 
>>> The preferred option would be to carry the branch on on github 
>>> rather than a shotgun merge to trunk. However as the
>>> lighthouse said to the aircraft carrier...
>>> 
>>> David
>>> 
>>> On 26 March 2013 11:01, Garth N. Wells <gnw20@xxxxxxxxx 
>>> <javascript:;>> wrote:
>>>> On 26 March 2013 13:39, Marie E. Rognes <meg@xxxxxxxxx
>>> <javascript:;>> wrote:
>>>>> 
>>>>> This week and coming weekend (including Monday) is Easter 
>>>>> holiday
>>> in Norway
>>>>> in general and at Simula in particular. Please postpone 
>>>>> deadlines
>>> by (at
>>>>> least) a week. No other objections.
>>>>> 
>>>> 
>>>> Does that mean that you have branches that you want to
>>>> merge? Unless there are branches to be merged, I don't see
>>>> the benefit of a delay.
>>>> 
>>>> Garth
>>>> 
>>>>> -- Marie
>>>>> 
>>>>> 
>>>>> 
>>>>> On 03/25/2013 11:45 PM, Anders Logg wrote:
>>>>>> 
>>>>>> In reference to previous discussions on the FEniCS
>>>>>> mailing list, are there any objections to the proposal
>>>>>> posted earlier today
>>> regarding a
>>>>>> freeze for branch merging before the pending git
>>>>>> conversion?
>>>>>> 
>>>>>> In detail, the suggestion is to
>>>>>> 
>>>>>> - Set a window for Friday this week to merge in
>>>>>> development branches
>>>>>> 
>>>>>> - Freeze all repositories during the weekend
>>>>>> 
>>>>>> - Convert everything to git including file stripping
>>>>>> 
>>>>>> - New branches will need to be created on the git side 
>>>>>> starting
>>> Monday
>>>>>> 
>>>>>> - Old branches on Launchpad will need be be abandoned
>>>>>> 
>>>>>> -- Anders

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature