[MERGE] log mainline only by default

[John Arbash Meinel]

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

Ian Clatworthy wrote:
> Matthew D. Fuller wrote:
>> On Thu, Mar 26, 2009 at 03:01:41PM -0500 I heard the voice of
>> John Arbash Meinel, and lo! it spake thus:
>>> So you could do:
>>>     revno: 118 [merge use -n0 to see children]
>> I would as soon see it at the end of the log for that rev; where the
>> merges would show up if they were shown.
>>
>> e.g.,
>> ------------------------------------------------------------
>> revno: 12345
>> [...]
>> message:
>>   Do stuff blac blah blah
>>     [6 merged revs elided: use -n0 to show]
> 
> We know whether a revision is a merge or not by looking at the parent count.
> We don't know the *number* of merged revisions hidden though cheaply, i.e.
> we'd need to calculate the full graph to give the right number.
> 
> Both --short and --line simply have [merge] included in the output.
> I think --long ought to do the same.
> 
> If we want to say 'use -n0 to show merged revisions', we ought to do
> it for all formats, not just --long IMO.
> 
> Ian C.
> 

I'm fine with that. My main concern is that we are changing the
*default* behavior to hide things, and people who don't know better
(since they are just using defaults) won't understand what is going on,
and will just think they lost stuff. People have already complained of
this from Loggerhead specifically. (I assume they thought the revisions
were gone after they merged & committed & pushed to Launchpad.)

John
=:->

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

iEYEARECAAYFAknMIGoACgkQJdeBCYSNAAO5SwCfYbYjtvf0GhloOEpFl2zS0vFT
zBwAoJAFAi3U/JvkKrkkbP4DMU06RU8F
=+41m
-----END PGP SIGNATURE-----