Merged revisions in log

[Gustavo Niemeyer]

> > The attached patch adds support for showing merged revisions
> > in the log, and was built against the current newformat branch.
> 
> I love the output. Unfortunately this fails tests when merged into my
> newformat-5 branch. I'd love to merge this - could you have a look at
> whats going on?

Oops, sorry. That additional change will fix it:

=== modified file 'bzrlib/log.py'
--- bzrlib/log.py
+++ bzrlib/log.py
@@ -173,6 +173,11 @@
     # list indexes are 0-based; revisions are 1-based
     cut_revs = which_revs[(start_revision-1):(end_revision)]

+    if cut_revs:
+        merged_revs = get_merged_revisions(cut_revs[-1][1], branch)
+    else:
+        merged_revs = {}
+
     if direction == 'reverse':
         cut_revs.reverse()
     elif direction == 'forward':


-- 
Gustavo Niemeyer
http://niemeyer.net