[MERGE] log mainline only by default

[John Arbash Meinel]

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

Ian Clatworthy wrote:
> Talden wrote:
> 
>>> I still think it would be nice to have a separate option for "--levels 0",
>>> rather than having "0" be something special, but I seem to be the only one
>>> of that opinion.
>> Well sort of... I'm happy for -n0 to remain but I would like a
>> friendly --show-merges alias for it. not only is 0 'special', it's
>> pretty non-obvious.
> 
> The missing command currently has an --include-merges option (it doesn't yet
> support most of the recently added options to log). For consistency, I'd like
> to use that name instead of --show-merges.
> 
> Otherwise, there's a small risk of redundancy but it's probably worth it in
> this case. I'll therefore put a patch up for log --include-merges soon.
> 
> Ian C.
> 
> 

I think we got some logic turned around with this, as I just did:

$ bzr log --long -r -1
- ------------------------------------------------------------
revno: 3909 [merge]
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: clean
timestamp: Mon 2009-03-30 13:49:32 +0200
message:
  Merge jam python groupcompress implementation

$ bzr log --long -r -1 -n1
- ------------------------------------------------------------
revno: 3909 [merge]
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: clean
timestamp: Mon 2009-03-30 13:49:32 +0200
message:
  Merge jam python groupcompress implementation
- ------------------------------------------------------------
Use --levels 0 (or -n0) to see merged revisions.


Notice that when I did "bzr log --long" it didn't give me the message,
but when I did "bzr log --long -n1" it *did*.

Now, I'm using this alias:
bzr alias log="log --short --forward -r-10..-1"

So it may be something with "bzr log --short --long" confusing the '-n1'
checker.

Thoughts?

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

iEYEARECAAYFAknQ1MQACgkQJdeBCYSNAAPM0ACfeQdGxRbTgCsfvcJruPlNoHRm
DPUAniLnARk6qNWhhsP8mXm218wGpJtZ
=dTjO
-----END PGP SIGNATURE-----