qlog: graph for partially merged branches

[Alexander Belchenko]

bzr.dev history sometimes looks like spaghetti, and often there is branches that partially merged in one mainline revision, have additional unmerged revisions those later merged to another branch.

So graph looked like this:

o
o
| o 1
| o 2
+ |
|\|
| o
| o
| o
|/
o
o

This is confusing for me right now and perhaps for other users will be. This two extra revision (marked as 1 and 2) is merged to another non-mainline branch. But IMO there should be some sign that they goes somewhere. Currently they just grow up and stay, until I expand that branch where they merged into.

I hope you understand what I'm trying to explain. I'll try to find this in qlog and will do screenshot then.

[Gary van der Merwe (garyvdm)]

Please see attachment to see how I have fixed this.

[Alexander Belchenko (bialix)]

Yes, something like this to indicate that there is another branch.

I also observe related bug with 'Children' link in bottom left view (revision info): when I clicked on that link I have traceback in the console. It seems like you trying to address that bug some revisions ago, can you double check that it works as expected?