On Tue, Feb 18, 2014 at 09:57:02PM +0100, Anders Logg wrote: > I'm about to start merging UFC into FFC (today or tomorrow, depending > on how smooth the process is). > > Should this be pushed into next or master? I'm inclined to push this > into master directly since the buildbots will need to be reconfigured > anyway (I assume, to remove UFC).
This seemed to go smooth. I have merged UFC into my local FFC/master using this recipe: http://stackoverflow.com/questions/1683531/how-to-import-existing-git-repository-into-another I still need to manually merge ChangeLog and other common files (but history for both is intact), but if there are no strong objections, I plan to push these changes to master for both UFC and FFC once things are running smoothly here. -- Anders _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
