bzr handholding: moving branches inside a shared repository

bzr handholding: moving branches inside a shared repository

[Glenn Morris]

Hi,

http://www.emacswiki.org/emacs/BzrQuickStartForEmacsDevs

(which I think you wrote?) says:

    "If you are working inside a shared repository like recommended
    above do not move the trunk directory around nor rename it."

But,

http://wiki.bazaar.canonical.com/Tutorials/CentralizedWorkflow#id15

says:

    "Organizing branches

    Branches inside a shared repository are almost as flexible as
    normal branches. That means you can copy them with cp -r, move
    them with mv and delete them with rm. The one restriction is that
    you cannot move them outside the repository."


Which is correct? If I have my branch in a directory called "trunk"
inside a shared repository, can I safely rename it to "trunk-foo"?
If I copy it to "trunk-copy", does this become an independent copy?

Thanks in advance.

Re: bzr handholding: moving branches inside a shared repository

[Stefan Monnier]

> Which is correct? If I have my branch in a directory called "trunk"
> inside a shared repository, can I safely rename it to "trunk-foo"?

Yes.

> If I copy it to "trunk-copy", does this become an independent copy?

Yes.

But other branches may refer to "trunk" in their .bzr/branch/branch.conf
file, so subsequent "bzr merge" (or similar) commands may keep trying to
refer to "trunk", at which point you'll have to explicitly use "bzr
merge --remember ../trunk-foo" to update the corresponding data.


        Stefan