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

[Kent Gibson]

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



Aaron Bentley wrote:
>
>> Are mainline revisions somehow golden?
>
> Yes they are.  They are the revisions you committed or pulled.
>

As are the merge revisions.

>> The only time this indent patch will apply is when you explicitly
>>  request a set of merge revisions using bzr log -rA..B, so you
>> are pretty well aware already of what  you will be getting.
>
>> e.g. bzr log -r2553.2.12..2553.2.13
>
> Won't that depend on whether the range "-r2553.2.12..2553.2.13"
> includes any mainline revisions?
>
Of course.  The point is that you will always get mainline revisions
in the log output UNLESS you do some pretty specific filtering with
- -r.  And if there ARE mainline revisions then the patch does not apply.
And for the example I chose there are no mainline revisions (I didn't
pick it completely at random):

- ------------------------------------------------------------
revno: 2553.2.13
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 15:53:55 +1000
message:
  Remove unneeded inner function in adapt_test_to_scenario.
    ------------------------------------------------------------
    revno: 2553.2.11.1.1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: adapter-cleanup
    timestamp: Mon 2007-07-02 15:52:59 +1000
    message:
      Remove unneeded inner function in adapt_test_to_scenario.
- ------------------------------------------------------------
revno: 2553.2.12
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 15:26:25 +1000
message:
  Merge with bzr.dev.

Cheers,
Kent.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGih4BgoxTFTi1P8QRAuAjAKC1PKyhB10LdTCnh0v/UQdSOSbo3wCgi8tv
5IthlL4fkfeX95SDsX8+uF0=
=5ocU
-----END PGP SIGNATURE-----