qlog branch1 branch2 shows incorrect labels when branch2 is merged into branch1

I suggest to backport this bugfix to 0.14.1

Gary, this problem still bites me.

See attached screenshots of graphs. This is from private repo, but I can try to reproduce exact graph structure in dummy repo.
I think it's somewhat similar to what Russel Winder recently reported in bzr.dev ML: some branch labels are hidden after qlog start.
On attached screenshots you can see that after start branch uart-refactoring is hidden (qlog-20090915-initial). After I've expanded twisty on revno 47 it was shown (qlog-20090915-expanded). And when I've collapsed this twisty branch label goes to wrong place (qlog-20090915-collapsed).

On Tue, Sep 15, 2009 at 11:16 AM, Alexander Belchenko <email address hidden> wrote:
> Some branch labels are hidden after qlog start.

I've fixed that now too.

> On attached screenshots you can see that after start branch uart-refactoring is hidden (qlog-20090915-initial). After I've expanded twisty on revno 47 it was shown (qlog-20090915-expanded). And when I've collapsed this twisty branch label goes to wrong place (qlog-20090915-collapsed).

I can't reproduce that the label goes to the wrong place.

I'm seeing something odd too - not sure if it is the same bug or different.

WinXP, Qbzr 0.15dev r961

<path to>/plugins is a shared repository

it contains two versioned branches - <path to>/plugins/qbzr and <path to>/plugins/explorer

With a cwd of "<path to>/plugins", invoking "bzr qlog ." (or simply "bzr qlog") produces a window that ONLY logs the history of explorer (presumably the first branch it finds alphabetically) but does not update the window title or give any indication of the true location of the branch.

--help documentation says "By default show the log of the branch containing the working directory." - that's not quite what is happening, I think?

On Tue, Sep 15, 2009 at 3:50 PM, David Roberts <email address hidden> wrote:
> I'm seeing something odd too - not sure if it is the same bug or
> different.
>
> WinXP, Qbzr 0.15dev r961
>
> <path to>/plugins is a shared repository
>
> it contains two versioned branches - <path to>/plugins/qbzr and <path
> to>/plugins/explorer
>
> With a cwd of "<path to>/plugins", invoking "bzr qlog ."  (or simply
> "bzr qlog") produces a window that ONLY logs the history of explorer
> (presumably the first branch it finds alphabetically) but does not
> update the window title or give any indication of the true location of
> the branch.
>
> --help documentation says "By default show the log of the branch
> containing the working directory."  - that's not quite what is
> happening, I think?

If should show the history for both branches, but this is not related
to this bug, so please log a new bug.