[MERGE][bug #83887] bzr log --short should include a [merge] indicator

[John Arbash Meinel]

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

The attached patch adds an indicator for which revisions are merges.

I played around with a couple different formats, but settled on:

 2482 Canonical.com Patch Queue Manager 2007-05-07 [merge]
      (robertc) Fix trivial incompatibility with bzr 0.11 servers, which
give a slightly different error to bzr 0.15 servers. (Andrew Bennetts)

 2483 Canonical.com Patch Queue Manager 2007-05-07 [merge]
      (robertc) Trivially update the location of bzrtools in
doc/centralized_workflow.txt

 2484 John Arbash Meinel        2007-05-08
      Add a test with a merged revision
      now we need to figure out what it should look like :)

 2485 John Arbash Meinel        2007-05-08
      Add [merge] after the timestamp for revisions with merges.



It doesn't do a whole lot for bzr.dev revisions, because all of them are
merges. But it is a little hint for people who have a different
development style.

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

iD8DBQFGQNmOJdeBCYSNAAMRAoTmAJ48hL/9ZHPQUrtGzzNVDtocyfnsOwCgi/fi
0i6sTEBIAW46FEPoB33BNUo=
=VjB5
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: log_short_merges_83887.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070508/566050f7/attachment.diff