Rev 1757: (jelmer) Import BzrCheckError in branch.py in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1757
revision-id: pqm at pqm.ubuntu.com-20060616183539-df942cdc7412bfe2
parent: pqm at pqm.ubuntu.com-20060616182913-d8dc0e4491aaa253
parent: john at arbash-meinel.com-20060616170147-fc708fe9fb5b8d61
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-06-16 19:35:39 +0100
message:
  (jelmer) Import BzrCheckError in branch.py
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060616170147-fc708fe9fb5b8d61
    parent: john at arbash-meinel.com-20060615215428-ec45e1eb0d8ccf72
    parent: jelmer at samba.org-20060613153241-31e736acdb7f98c7
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2006-06-16 12:01:47 -0500
    message:
      [merge] Jelmer Vernooij: import BzrCheckError in branch.py
    ------------------------------------------------------------
    merged: jelmer at samba.org-20060613153241-31e736acdb7f98c7
    parent: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: integration
    timestamp: Tue 2006-06-13 17:32:41 +0200
    message:
      Fix missing import of BzrCheckError.