Rev 1918: (hermann kraus) Fix bundle exceptions in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Aug 14 17:15:54 BST 2006


------------------------------------------------------------
revno: 1918
revision-id: pqm at pqm.ubuntu.com-20060814161553-7186d7578591bf2b
parent: pqm at pqm.ubuntu.com-20060814155317-e2d508d6f2646a4b
parent: john at arbash-meinel.com-20060814160729-a87d9e3104eea2a2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-08-14 17:15:53 +0100
message:
  (hermann kraus) Fix bundle exceptions
modified:
  bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060814160729-a87d9e3104eea2a2
    parent: john at arbash-meinel.com-20060814160414-87e7cb6bf2113977
    parent: hermann at physiklaborant.de-20060806230644-2ed4719df86b8bd1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2006-08-14 11:07:29 -0500
    message:
      [merge] Hermann Kraus: updates to Bundle exceptions
        ------------------------------------------------------------
        merged: hermann at physiklaborant.de-20060806230644-2ed4719df86b8bd1
        parent: hermann at physiklaborant.de-20060806155007-9d2d684d8f04c084
        committer: Hermann Kraus <hermann at physiklaborant.de>
        branch nick: bzr.dev
        timestamp: Mon 2006-08-07 01:06:44 +0200
        message:
          Detect wrong eol markers.
        ------------------------------------------------------------
        merged: hermann at physiklaborant.de-20060806155007-9d2d684d8f04c084
        parent: pqm at pqm.ubuntu.com-20060802020654-9d81db40bba14f69
        committer: Hermann Kraus <hermann at physiklaborant.de>
        branch nick: bzr.dev
        timestamp: Sun 2006-08-06 17:50:07 +0200
        message:
          Convert bundle errors from Exception to BzrNewError.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060814160414-87e7cb6bf2113977
    parent: john at arbash-meinel.com-20060814150251-6949ffe2e4a31486
    parent: pqm at pqm.ubuntu.com-20060814155317-e2d508d6f2646a4b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2006-08-14 11:04:14 -0500
    message:
      [merge] bzr.dev 1917



More information about the bazaar-commits mailing list