To merge or not to merge?

[John Arbash Meinel]

Aaron Bentley wrote:
> 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.
> 
> Okay, I've gone back and confirmed that this is how it works.  So I
> guess the rest of the post is on pretty questionable ground.  Thanks for
> setting me straight.
> 

So actually, because of this, it is better to merge from bzr.dev
frequently. As in before you continue to do any work after you have been
merged.


>>> PS> I think the reason it is 10 lines long is since the sprint, there
>>> has been a lot more concurrent development going on. And I know I've
>>> been working harder to get user patches merged. And since we now use
>>> bundles, they all show up as independent development, rather than patches.
> 
> Not only that, but lately we've been merging some very long-lived
> branches, e.g. patience and w-changeset.  Those take up space from the
> time they're branched 'till the time they're merged.  Would be nice if
> we could seen the branch nick on the lines, (not in the revision data)
> somehow.
> 
> Aaron

Yeah, looking through the history is kind of interesting.
We have ~3 screens just for the encoding changes. And 13 screens for the
changeset code.

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.

Just some ramblings, I guess.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060622/54d6758d/attachment.pgp