To merge or not to merge?

[Michael Ellerman]

On 6/23/06, John Arbash Meinel <john at arbash-meinel.com> wrote:
> There is something about the current bzrk that doesn't sit great with
> me. Maybe it is just that you can't collapse a branch. Maybe something
> about how all the changes tend to show up as a straight line of 20+
> commits for a moderate-sized feature branch.
>
> I don't really know how to do it any better, though. I think the general
> problem is that it is really an N dimensional branching structure that
> we are trying to display in 2D.
>
> I'm curious what it would look like if instead of showing all of the
> tails, we just show the tail for the last merge.
>
> So if I branched bzr.dev at revno 1500, did 50 commits, merged it after
> bzr.dev had grown to revno 1520, and then did 2 more commits and got it
> integrated, we would show a line from 1520->my1550, and then my
> 1552->1521. and just a long tail hanging off of my 1550. Perhaps
> defaulted to be collapsed.

You'll have to draw me a picture :)

Sounds interesting. I think having bzrk rock hard is really important
for bzr to be the best it can be.

cheers