What I've learned from scmproj (Re: what should be done to merge nested trees patch to bzr-core?)

[Chris Hecker]

Yes, that looks like what I want as well!  The --squash option is a 
crucial part of that for me, I think.

I agree with your original comments about how you really don't want to 
break the dvcs property of having the whole thing sitting there in the 
branch locally.  This subtree thing seems like the right balance between 
using a library, modifying it locally, and being able to pull it back 
out to use in other projects.  The "external" nature of svn:externals 
always seemed like a dependency problem, and making the extraction step 
manual is the right call, I think.

Can we get this into bzr?!  :)

Chris



On 2011/06/18 10:49, Alexander Belchenko wrote:
> 16.06.2011 13:41, Alexander Belchenko пишет:
>> But as I think further, I come to conclusion that the best nested
>> trees can be obtained if we just merge components into root component.
>> This will automatically solve a lot of highlighted problems. But it
>> will create a new problem: how to extract the component then? Share
>> changes between projects using the same component?
>
> It seems very close to what I'm looking for is implemented in
> git-subtree:
> https://github.com/apenwarr/git-subtree/blob/master/git-subtree.txt
>
> "They are also not to be confused with using the subtree merge
> strategy. The main difference is that, besides merging
> the other project as a subdirectory, you can also extract the
> entire history of a subdirectory from your project and make it
> into a standalone project. Unlike the subtree merge strategy
> you can alternate back and forth between these
> two operations. If the standalone library gets updated, you can
> automatically merge the changes into your project; if you
> update the library inside your project, you can "split" the
> changes back out again and merge them back into the library
> project."
>
>