[Monotone-devel] Re: Sharing subprojects between projects

[Bruce Stephens]

Anthony Williams <address@hidden> writes:

[...]

> Also, in my case it doesn't work so well --- I would like to make
> changes to the subproject as appropriate to the master project it's
> being used in, optionally propagate these changes back to the
> subproject branch, and still be able to pull in changes made to the
> subproject elsewhere.

So (in current terms), you'd want to branch the subproject,
merge_into_dir that branch into the main branch (and propagate from
then on).  Generally you'd then want changes just to propagate into
the branch of the subproject, but occasionally you'd want them to go
into the original.

So if changes to a merge_into_dir could be somehow committed to the
branch, you could do something close to what you want now just by
adding an extra branch (to represent the variant of the subproject
that's for this master project).  As you say, pluck comes reasonably
close, though there are likely problems because pluck is basically
"patch".

I'd just use nested checkouts in this case.  With this extra branch
that ought to work OK.  It would be nice to have a little more
support, but as I mentioned, what that ought to include isn't obvious.
I guess mercurial's forest extension is most developed so maybe that
would be a good model?

[...]