[MERGE] log --merge-revisions

[John Arbash Meinel]

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

Ian Clatworthy wrote:
> 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.
> 

Vincent used the option "--include-merges" for this functionality as
part of "bzr missing" is there a reason to use a different option name?

Also, how does this work with the "default" setting of a format. If I do
"bzr log --short" does it default to --no-merge-revisions, or will I now
have to do "bzr log --short --no-merge-revisions" to get the same
behavior? (Similarly with 'bzr log --long --merge-revisions'.)

I think having a knob to tweak is nice, I'm just thinking we probably
want to default to preserving the old behavior unless strongly warranted.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkl143wACgkQJdeBCYSNAAMbrACcDtSPrCuSiMYEZiKQI2EETOoh
FRUAnRdYcSV0C2/ShddulcAvTs7kSUxf
=ham6
-----END PGP SIGNATURE-----