combining 2 projects under one repository

[Colin D Bennett]

On Thu, 03 Nov 2011 20:17:06 +0100
Jelmer Vernooij <jelmer at samba.org> wrote:

> > This “cherrypick” merge will completely discard the history of
> > the imported project, right?
> No, this isn't a cherrypick merge since -r0.. isn't open-ended on
> the left side. Using e.g. -r2.. would be a cherrypick merge.

> > I recall hearing about “bzr join”, but after reading the
> > documentation on it, I am thoroughly lost as to its utility in
> > cases like Matt's (importing one branch into another unrelated
> > branch).  I do not understand the concept of “rich-root” and
> > “subtree”.
> If you had a library named say "libbla" and wanted to import that
> into another project, you can use "bzr join" to merge it into a
> particular path in your main project. The difference with "bzr
> merge -r0.." is that merge will try to merge it into the root
> directory.

Jelmer, thanks for the clear explanation!

Regards,
Colin