To merge or not to merge?

[Robert Collins]

On Thu, 2006-06-22 at 18:47 -0500, John Arbash Meinel wrote:


> Well, my understanding of Robert's changes to bzrk is that it actually
> shows a merge at this point the same way you would show a pull. As a
> convergence in the past, and then a new tip starting.
> Because of that property. If the entire branch has been merged in, and
> then you merge back, it isn't interesting enough to warrant a whole new
> line. The changes weren't "in-flight" at the same time as when other
> people were working.

Right. The goal was to show:
 * All the revisions introduced into mainline by a merge in a cluster.
 * Only show tails when work was actually outstanding, as opposed to
just because someone reused a branch.

This was intended to have precisely the effect you are noting: that the
tramlines are massively reduced, and the display is more understandable.

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/20060626/66b4379a/attachment.pgp