[MERGE] log --merge-revisions

[Ian Clatworthy]

As Martin and Robert pointed out, making the display of
merge revisions an option to log is a cleaner approach
than the long-, short+ and line+ formats I proposed.

This patch adds --merge-revisions to log. This lets you
override the format's default behaviour, i.e. you can do
stuff like:

  bzr log --short --merge-revisions
  bzr log --long --no-merge-revisions

The only downside to this is that the setting can't be
configured per branch (like long- allowed). It can still
easily be configured per user though by adding an alias
to bazaar.conf like

  log=log --no-merge-revisions

I think that's flexible enough.

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: log-merge-revisions.patch
Type: text/x-diff
Size: 30678 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090120/bf62f1e9/attachment-0001.bin