What I've learned from scmproj (Re: what should be done to merge nested trees patch to bzr-core?)
Alexander Belchenko
bialix at ukr.net
Sat Jun 18 17:49:25 UTC 2011
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."
More information about the bazaar
mailing list