Submodule improvements

Jelmer Vernooij jelmer at samba.org
Fri Jun 19 09:37:46 MDT 2015


Hi Metze,

Any news on this?

Thanks,

Jelmer

On Mon, Jun 08, 2015 at 02:42:21PM +0200, Stefan (metze) Metzmacher wrote:
> Hi Jelmer,
> 
> > ping :)
> 
> I hope to find the time to write my findings down this week...
> 
> metze
> 
> > On Sun, May 24, 2015 at 03:48:32PM +0000, Jelmer Vernooij wrote:
> >> On Thu, May 21, 2015 at 02:45:48PM +0200, Andrew Bartlett wrote:
> >>> On Mon, 2015-05-18 at 20:23 +0000, Jelmer Vernooij wrote:
> >>>> This patchset improves our handling of submodules in our build system,
> >>>> by preventing developers build with outdated submodules if there are
> >>>> any present. This should hopefully address the concerns that Andrew
> >>>> raised in the last thread.
> >>>>
> >>>> While I was there, I also removed support for running Samba from a
> >>>> bzr repository rather than Git. I'm pretty sure I was the only who
> >>>> ever used that.
> >>>
> >>> Thanks Jelmer,
> >>>
> >>> I've pushed those with my review and then looked with metze to see what
> >>> we could do to make this work.  He can speak for himself, but when
> >>> demonstrating his concerns to me the major issue that he hit was the
> >>> boundary conditions when moving back and forth (such as in a rebase)
> >>> over the boundary where a submodule is put into use, with untracked
> >>> files appearing.  
> >> That should be a temporary issue while we migrate; once we have it's
> >> only a minor nuisance (you have to rm -rf third_party/dnspython before
> >> switching to an old branch).
> >>
> >> As a workaround, we could add the submodule in a different path
> >> than where the original code used to live so they don't conflict. E.g.
> >> bundled/dnspython rather than third_party/dnspython.
> >>
> >>> We did however show that the issues around initialisation of the
> >>> submoudle git modules could be handled fairly well by the fact that
> >>> submodule objects live in the .git directory, or a helper script for the
> >>> original git clone/fetch.
> >> What specifically doesn't work there that isn't handled by
> >> --recursive?
> >>
> >> Cheers,
> >>
> >> Jelmer
> >>
> >> -- 
> >> Jelmer Vernooij <jelmer at samba.org> - https://jelmer.uk/
> > 
> 




More information about the samba-technical mailing list