[PEBKAC] Bzr mixing up branches?

[Marius Kruger]

2009/1/30 Sohail Somani <sohail at worklogassistant.com>

> Related branches:
>    push branch: /home/sohail/bzr/code/master <--- HUH?
>  parent branch: /home/sohail/bzr/code/master <--- HUH?
>  submit branch: /home/sohail/src/ssci


yeah that bugs me too.
Checkout and bound branches doesn't have anything to do with the above
locations.
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)


> Yesterday, I wanted to fix a bug in the master branch so I switched to
> it. Looking at the log however, I noticed that all the checkins I had
> made to the next branch are in the master directory, although under the
> branch nick "next".
>

Some stabs in the dark:
1) how did you create next?
    if you did `bzr checkout master next` , that would explain how it ended
up in master. (anything going to next would go to master automatically)
2) after committing did you maybe do a `bzr push` without specifying a
location?
   with the above locations this would send your changes to the master.

regards
marius
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090130/38ccb948/attachment.htm