To merge or not to merge?

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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.

> 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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEmzAJ0F+nu1YWqI0RAnA9AJ9oNG/11E9YfhOGId1PY6nxeBYpygCeOrDF
L/i1s/G0iSdK3px7KDdpZ2o=
=zRPi
-----END PGP SIGNATURE-----