[PEBKAC] Bzr mixing up branches?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Marius Kruger wrote:
> So if you are using switch to change between the master and next
> branches you should only use
> update and commit. Other commands like push, pull, merge and missing
> uses the above locations, so they are dangerous in this scenario IMO.
> (I want to fix this but don't know what people would agree on to be a fix)

The policy is that checkouts should do whatever a lightweight checkout
would do.  Push should push the master branch into its push location.
Pull should pull from the master branch's parent location and update the
local branch correspondingly.

Similarly, merge should use the master branch's submit location.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmGIR8ACgkQ0F+nu1YWqI1FxQCffm7yC4pEquQsZi40s4mMYDyg
1TQAnA7AmLqXLoHEgpi7Zw0OfWYC8wHp
=SYOG
-----END PGP SIGNATURE-----