[MERGE] log mainline only by default

[Ian Clatworthy]

John Arbash Meinel wrote:

> 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

The message is expected there. I'll take a look later today.

> $ 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.

That's ok in this case.
> 
> 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.

It shouldn't be. There's a no-alias option you can try, isn't there?

Anyhow, I'm out for much of the day but I'll take a look when
I get back.

Ian C.