[MERGE] Add merge indication to the line format

[Neil Martinsen-Burrell]

This is another one of the patches that Ian C. suggested would be  
appropriate for novices.  This adds the text "[merge]" to the line  
format of log, so that revisions which are merges are easily  
identified for further scrutiny (such as with ``bzr log --line -n0 - 
r ...``)

It was also suggested that with the advent of the -nN options to log,  
it might also be nice to have a similar indication for the long log  
format.  I did *not* do that here because I couldn't figure out a  
clean way to get the revno's for the parent revisions from the  
information that the log formatter has (which is their revision ids).   
As a workaround, if one doesn't mind looking at revision-ids, ``bzr  
log --show-ids --long -n1`` will indicated merge revisions by listing  
more than one parent.

As an aside, there are now lots of separate log-related items in  
NEWS.  I don't know if we ever edit NEWS to be more readable and less  
indicative of every single separate contribution, but since 1.12 looks  
like our "Loggy" release, maybe we should consider putting something  
more polished in the release notes.

-Neil

-- 
"The object of mathematics is the honor of the human spirit."
   -- Carl Jacobi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: line-merge-indicators.patch
Type: application/octet-stream
Size: 5148 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090206/4f392266/attachment-0001.obj 
-------------- next part --------------