[PATCH] indent merges more nicely during merge

Robert Collins robertc at robertcollins.net
Tue Mar 28 15:33:22 BST 2006


This patch makes log indent merges more prettily and ensures full
topological order within merge regions.

I.e.
------------------------------------------------------------
revno: 1591
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-20 10:33:11 +0000
message:
  (mbp) pycurl bugfixes, robert's knit performance stuff
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060320095825-ed99032ef9743cc8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Mon 2006-03-20 09:58:25 +0000
    message:
      [merge] robert's knit-performance work
        ------------------------------------------------------------
        merged:
robertc at robertcollins.net-20060314102728-7e47b9b8cd6c3d73
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versioned-file-performance
        timestamp: Tue 2006-03-14 21:27:28 +1100
        message:
          rollback from using deltas to using fulltexts - deltas need
more work to be ready.
        ------------------------------------------------------------
...


Rob


-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: log-indents-merges-better.patch
Type: text/x-patch
Size: 30813 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060329/39224360/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060329/39224360/attachment.pgp 


More information about the bazaar mailing list