On 5 January 2015 at 13:41, Jan Blechta <[email protected]> wrote:

> On Mon, 05 Jan 2015 11:03:39 +0000
> "Garth N. Wells" <[email protected]> wrote:
>
> >
> > On Mon, 5 Jan, 2015 at 10:45 AM, Anders Logg <[email protected]> wrote:
> > > Hi,
> > >
> > > Here are some thoughts on a possible developer workflow (partly)
> > > based on HashDist.
> > >
> > > The current HashDist-based installation (fenics-install.sh) seems
> > > to work relatively well (yes there are bugs but Johannes has been
> > > very good at fixing them). Users and developers both can now easily
> > > build from source an entire FEniCS stack including both
> > > dependencies and FEniCS components.
> > >
> > > However, for developers that need to work on features/bugs for a
> > > specific FEniCS package (say FFC or DOLFIN) it is less clear how to
> > > base the workflow on HashDist.
> >
> >
> > Related to this issue, when we switched to git the thought was to
> > consider submodules/trees once we were comfortable with git. I think
> > the time is right to take a look. Subtrees could be helpful:
> >
> >
>
> Please, note that there are 3 distinct concepts
>
> 1. subtree merging
>
> > http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge
> >
>
> 2. 'git subtree' command
>
> > https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt
>
> 3. submodules
>
> http://git-scm.com/book/en/v2/Git-Tools-Submodules#_git_submodules
>
> By first reading, 2. seems to be transparent for end-users and allows
> what we want - keeping separate history of subtrees.
>
>

2. looks right to me.

Martin
_______________________________________________
fenics mailing list
[email protected]
http://fenicsproject.org/mailman/listinfo/fenics

Reply via email to