[MERGE] log --include-merges

[John Arbash Meinel]

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

Ian Clatworthy wrote:
> With patch this time. :-(
> 
> Ian Clatworthy wrote:
>> John Arbash Meinel wrote:
>>
>>> Vincent used the option "--include-merges" for this functionality as
>>> part of "bzr missing" is there a reason to use a different option name?
>> Not really. I'll change it. I'd also like to add a short option.
>> I propose -n (and we extend the help message to say
>> "Show (nested) merge revisions.").
> 
> Done. I've added -n as a shortcut option to missing as well.
> 
> My only concern with the "include-merges" name is that users
> migrating from git/hg might take it to mean something different, i.e.
> whether to show/hide merge points. (Not that --merge-revisions
> solved that.) I'm planning to give the help for log some love
> once the various log patches I have in the review queue land.
> 
> Ian C.
> 
> 

Would it be clearer as:

- --mainline-only
and
- --not-mainline-only

(I realize the default args would make it --no-mainline-only, which
isn't great)

I don't like "-n" as the short option. Especially since it gets confused
with "--no-include-merges". If we wanted 'n' then we should probably
name it "--include-nested" or something along those lines. I do realize
that 'm' is taken. I also realize that we don't have a way to do "-n" =>
show, "-N" => no show.

For now, I'd rather not have a short option until we determine if it is
really necessary. Do you feel strongly about it?

Otherwise things seem fine.

BB:tweak

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

iEYEARECAAYFAkl3VFsACgkQJdeBCYSNAAPCyQCgzwV2Wep5anSkz6ZSCc6vTOkM
Z88AnRdahlNF1qQxE+0H7RcauLwMT7YK
=JSlL
-----END PGP SIGNATURE-----