fenics team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

On Tue, Apr 16, 2013 at 02:58:42PM +0200, Martin Sandve Alnæs wrote:
> I think the main challenge for us is to adapt the workflow to
> cross-project changes.
>
> How to deal with topic branches for cross-project features is not
> discussed directly in gitworkflows, but I guess the natural extension
> is simply to:
> - Create topic branches with same name across relevant projects.
> - Do each step such as merging into maint/master/next, etc.
> simultaneously for all projects.

Sounds good for now.

> The core point being that maint/master/next/mytopic brances must be
> kept compatible across projects at any time (when published).

One of the reasons we move to git was that we might use subtrees.
I think we should let the dust settle (still issues to fix) and then
discuss how we might use subtrees of if we might merge some of the
repositories together.

--
Anders


> There's a potential race condition if Alice and Bob try pushing
> simultaneously to fenics/*/master, but that's not a new problem.