joining trees ?

It seems you want a shared repository, not joining trees.

So you should do (starting from scratch):
bzr init-repo ~/myproj
bzr init ~/myproj/projA
bzr init ~/myproj/projB

This way projA and projB will use the repository in ~/myproj to store their revisions, projA and projB containing only the branch themselves which will use ~/myproj repository.

Since you already defined a branch with its own repository (when you did bzr init ~/myproj/projA), what happened when you did bzr init in ~/myproj is that bzr created a stand alone branch at ~/myproj.

So I think you should do:
mv ~/myproj to ~/myproj.old
bzr init-repo ~/myproj
bzr branch ~/myproj.old/projA ~/myproj/projA

For projB you may want to start again by:
bzr init ~/myproj/projB
to get a clean start, put your files under ~/myproj/projB and bzr add, bzr commit there.

bzr join is used when you want to import, say, a library already under bzr into your project, not what you seem to search for here.

Hi Vila,

Thanks very much for your answer.
Doing what you suggested, I will get a single repository with two independant branches in it (projA and porjB), right?

In fact I was not clear in my wording. After having worked for a while with myproj/projA, I realised that projA should not be an independant project, but was in fact part of a bigger project myproj. So I would like kind of move the repository below (to myproj) and add more to the project (projB, etc..) and I do not want to have projA independant from projB... That is why I was looking at join.

Seb.

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Nobody can help me on that one?
Thanks in advance!
Seb.

You might want to do 'bzr upgrade --1.6.1-rich-root' (or 'bzr upgrade --rich-root-pack', depending on the version you're using) and try again.

Dan

Thanks Dan.

However after doing that, I now get the error:

bzr: ERROR: Cannot join projA. Trees have the same root

Seb.

Seb,

Is it enough to just simply merge the trees together, ie 'cd projA; bzr merge ../projB'?

Thanks Martin for your sugggestion.
No, merging is not what I am looking for here.

Seb.

On Wed, Oct 22, 2008 at 11:59:56PM -0000, Martin Pool wrote:
> Question #46922 on Bazaar changed:
> https://answers.edge.launchpad.net/bzr/+question/46922
>
> Status: Open => Answered
>
> Martin Pool proposed the following answer:
> Seb,
>
> Is it enough to just simply merge the trees together, ie 'cd projA; bzr
> merge ../projB'?

If they are inited seperately that would have to be 'bzr merge -r 0..-1
../projB'

Wouter van Heyst

I am able to join properly on brand new branches.

e.g. this works:

jrwren@theknife /c/temp
$ bzr init -v --1.9-rich-root A
Created a standalone tree (format: 1.9-rich-root)

jrwren@theknife /c/temp
$ cd A

jrwren@theknife /c/temp/A
$ bzr init -v --1.9-rich-root B
Created a standalone tree (format: 1.9-rich-root)

jrwren@theknife /c/temp/A
$ bzr join B
renamed file:///C:/temp/A/B/.bzr to .bzr.retired.0

jrwren@theknife /c/temp/A
$

But if I do the same thing on two existing branches, both of which were upgraded to 1.9 rich root, I get the same error as Seb.

bzr: ERROR: Cannot join myproject2/. Trees have the same root

Seb, this was many months ago, did you ever find a solution?

>Seb, this was many months ago, did you ever find a solution?
No unfortunately!

Seb.

If you don't want them to be independent but you don't want them to be merged it's not clear to me what you do want to have happen.

Maybe you should look at <http://bazaar-vcs.org/ScmProj>

This question was expired because it remained in the 'Needs information' state without activity for the last 15 days.