On 9/27/10 8:18 AM, Casey Dahlin wrote:
> On Sun, Sep 26, 2010 at 06:17:45PM -0700, Grant Erickson wrote:
>> On 9/20/10 6:37 PM, Casey Dahlin wrote:
>>> On Mon, Sep 20, 2010 at 06:22:09PM -0700, Grant Erickson wrote:
>>>> Perhaps 'submodules' are what I am looking for?
>>>
>>> Yup, exactly :) the manpage git submodule should get you going.
>>
>> Casey:
>>
>> Thanks for the prompt reply.
>>
>> I spent some time over the weekend playing with the various submodule
>> tutorials and I wasn't left feeling convinced that it's the right solution,
>> particularly with the added complexity around commits and pushes (trailing
>> slashes, etc.) that I am sure my users are going to get wrong more often
>> than right.
>>
> *snip*
>>
>> And so on for the linux subtree as well. Any further tips or course
>> corrections you can offer, particularly relative to subtree merges?
>>
>
> Unfortunately I'm not an expert here. I know what submodules do but I haven't
> used them much (in fact I last looked at them just after they were introduced.
> They were even rougher back then).
>
> I may have missed it but if you haven't I'd update the list on all of this
> again.
Casey:
Over the course of the weekend, I found a tool, braids, that does EXACTLY
what I need. While it'd be great if it were integrated into GIT, I'll take
it's external nature for now:
http://github.com/evilchelu/braid
It would appear that in the background it uses the subtree merge strategy
and a repository-local metadata files (.braids) to accomplish what it does.
Best,
Grant
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html