Re: how to filter a pull

From: Junio C Hamano <junkio@cox.net>
Date: May 3, 2007, 18:21 UTC
Message-ID: <7vwszpzs33.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070503150752.GB6500@xp.machine.xx>

Peter Baumann <waste.manager@gmx.de> writes:

> On Thu, May 03, 2007 at 03:17:05PM +0200, marc.zonzon@gmail.com wrote:

Show 8 quoted lines

>> I have projects that draw some parts from two or three other
>> projects. But it is usually some small part, that are included, and
>> patched in my project. I want to follow the development of these fellow
>> projects.
>> ...
> Perhaps the newly added merge strategy subtree [1] could work. Or the
> just added subproject support, but this is very new and only the lowlevel machinery
> is implemented right now.

I do not think subtree merge would work with this situation, as it is only for cases that one side of the merge represents a tree that is a subset of the tree of the other side of the merge. marc.zonzon's case does not fit the pattern.

If I were doing this 6 months from now, I would probably use subproject to host the whole tree of other projects somewhere, adjust the build procedure of the primary project to borrow the whole of these other projects not just subtree -- or have appropriate symlinks in the superproject that point into relevant subtrees in the subprojects.

If I were doing this today, I would probably use separate repositories, next to the primary project, to host the whole tree of other projects, adjust the build procedure of the primary project to borrow the whole of these other projects not just subtree -- and/or have appropriate symlinks in the primary project that point into relevant subtrees in the neighbouring repositories that host these other projects.