[RFC][MERGE][BZRK][Still reading?] Shiny new revision-layout for bzrk

[Robert Collins]

On Fri, 2006-03-31 at 15:38 +0200, Erik Bågfors wrote:
> 2006/3/31, Aaron Bentley <aaron.bentley at utoronto.ca>:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > This new display looks pretty whack.
> > On a bzr viz of bzr.ab.integration (which takes AGES):
> 
> I use Jamies branch, which includes this new display.  It takes 5
> seconds to load bzr viz on current bzr.dev. I think that's ok.
> 
> I just wanted to check this, but I am using bzr.dev, not bzr.ab.integration.
> 
> > pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d is shown on a
> > different line from
> > pqm at pqm.ubuntu.com-20060329154814-a5e1b3e2b9685db3
>
> Same line here....

Its almost certainly Aaron's revision-history file overriding what is
considered a 'branch'. All revisions on the revision-history get put at
the leftmost column, which if the revision history contains 'converged'
revisions - where Aaron sent something to pqm, then did a pull (without
--overwrite), his revision will be on the mainline, and pqms shows as a
merge into his branch.

> > pqm at pqm.ubuntu.com-20060330053557-a81c03289ce7560d
> > is shown as a direct descendant of
> > abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
> 
> Not here..
> 
> > when it's actually a merge of
> > pqm at pqm.ubuntu.com-20060329154814-a5e1b3e2b9685db3 and
> > aaron.bentley at utoronto.ca-20060323051403-90fb2a3645c05dd1
> 
> That's how it shows up for me.
> 
> > pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
> > is not shown as a merge of
> > abentley at panoramicfeedback.com-20060323182255-a536a0f797cbf7c6
> 
> It is here...
> 
> > mbp at sourcefrog.net-20060320182752-44ffa76314daacb6
> > isn't shown as a merge of
> > pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f and
> > robertc at robertcollins.net-20060320073835-61854f8dc05101b0

merges into a branch from
already-merged-to-mainline-by-the-time-this-revision-was-merged-to-mainline revisions are not shown in the new layout - because it was aiming to make it more relevant to patch flow, not showing all the nitty-gritty who-merged-who *when it does not affect mainline*.

It should be trivial to add a flag to turn those back on, for folk that
want bzrk as a debugging-of-bzr tool.

Rob


-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060402/9d80d75c/attachment.pgp