[MERGE] left align log output if it only contains merge revisions

[Ian Clatworthy]

Andrew Bennetts wrote:

>> But my point about 99% is that the 99% of cases build the expectation
>> that the flush-aligned revisions are mainline revisions.
> 
> You could equally well argue that 99% of cases build the expectation that the
> output of bzr log always starts unindented.
> 
> I think the concept that log of only non-mainline revisions is indented to
> remind you that they aren't mainline is pretty subtle and is unlikely to be
> understood by many, or even most, users.

Well, I left this alone this morning because it sounded dead and buried
given abentley, jam and fullermd all agreed. I agree with Kent and
Andrew FWIW. The indent doesn't mean anything special to me - it's just
wasted whitespace that I'd rather not have there in the 1% of time it
appears.

I also agree it's not a big deal though. My leaning was towards
accepting the patch because Kent obviously felt strongly enough about it
to do something about it. I like to encourage that and this isn't
breaking anything IMO.

>> Thanks.  I'm sorry if this has been frustrating for you.

There are two aspects here. Firstly, Kent took the time to make a change
and no-one bar Aaron provided feedback until weeks later. :-( I agree
with Kent that I'm at fault there because I didn't chase anyone. (My
lame excuse is that I was kind of waiting for an RFC on who would be RM
for 0.18 rather than assume it was me.) Secondly, email has a tendency
to come across as "confrontational" during disagreements. If the same
debate was held in a room, the people in question would probably sort it
out in a few minutes with next to no angst or frustration. That's a
motherhood statement and doesn't help, though it good to remind
ourselves of that now and then.

> Yeah.  Kent, thanks for tackling #4663, I'm looking forward to having that
> fixed, regardless of the indenting :)

And poolie assures me this is in review and he's equally keen to see it
land.

Ian C.