dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

If I understood Florian correctly, he didn't mind starting the branch
over from scratch. If you merge it with trunk just before the
conversion to hg, you could easily recreate your branch on the git
side. The only downside is that you will have to drop your history.
Is it important to keep it? Perhaps for credit and blame?

--
Anders


On Tue, Mar 26, 2013 at 03:34:16PM +0000, 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
>
> 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> wrote:
> > On 26 March 2013 13:39, Marie E. Rognes <meg@xxxxxxxxx> 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
> >
> >>
> >>
> >>
> >> 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
> >>>
> >>>
> >>> _______________________________________________
> >>> Mailing list: https://launchpad.net/~fenics
> >>> Post to     : fenics@xxxxxxxxxxxxxxxxxxx
> >>> Unsubscribe : https://launchpad.net/~fenics
> >>> More help   : https://help.launchpad.net/ListHelp
> >>
> >>
> >>
> >> _______________________________________________
> >> Mailing list: https://launchpad.net/~fenics
> >> Post to     : fenics@xxxxxxxxxxxxxxxxxxx
> >> Unsubscribe : https://launchpad.net/~fenics
> >> More help   : https://help.launchpad.net/ListHelp
> >
> > _______________________________________________
> > Mailing list: https://launchpad.net/~fenics
> > Post to     : fenics@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~fenics
> > More help   : https://help.launchpad.net/ListHelp
>
>
>