[MERGE] Missing import of BzrCheckError

[John Arbash Meinel]

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

Jelmer Vernooij wrote:
> Hi,
> 
> Attached is a fix for a missing import of BzrCheckError in
> bzrlib/branch.py. 
> 
> Mergeable from http://samba.org/~jelmer/bzr/integration
> 
> Cheers,
> 
> Jelmer
> 

This was +1'd, but I couldn't find it in your integration branch. And
for some reason, it was dos formatted when I tried to save it. But I
fixed the line endings, and merged it into my jam-integration branch,
and pushed it to the pqm.

John
=:->

> 
> 
> ------------------------------------------------------------------------
> 
> # Bazaar revision bundle v0.7
> #
> # message:
> #   Fix missing import of BzrCheckError.
> #   
> # committer: Jelmer Vernooij <jelmer at samba.org>
> # date: Tue 2006-06-13 17:32:41.902893066 +0200
> 
> === modified file bzrlib/branch.py
> --- bzrlib/branch.py
> +++ bzrlib/branch.py
> @@ -30,13 +30,13 @@
>  from bzrlib.decorators import needs_read_lock, needs_write_lock
>  from bzrlib.delta import compare_trees
>  import bzrlib.errors as errors
> -from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
> -                           NoSuchRevision, HistoryMissing, NotBranchError,
> -                           DivergedBranches, LockError,
> -                           UninitializableFormat,
> -                           UnlistableStore,
> -                           UnlistableBranch, NoSuchFile, NotVersionedError,
> -                           NoWorkingTree)
> +from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches, 
> +                           HistoryMissing, InvalidRevisionId, 
> +                           InvalidRevisionNumber, LockError, NoSuchFile, 
> +                           NoSuchRevision, NoWorkingTree, NotVersionedError,
> +                           NotBranchError, UninitializableFormat, 
> +                           UnlistableStore, UnlistableBranch, 
> +                           )
>  import bzrlib.inventory as inventory
>  from bzrlib.inventory import Inventory
>  from bzrlib.lockable_files import LockableFiles, TransportLock
> 
> # revision id: jelmer at samba.org-20060613153241-31e736acdb7f98c7
> # sha1: 86051bee8261db455a25d84acc9103dfee515c0f
> # inventory sha1: ddaefab33ed4d921d494d537f9e92751952a6ce0
> # parent ids:
> #   pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
> # base id: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
> # properties:
> #   branch-nick: integration
> 

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

iD8DBQFEkuQoJdeBCYSNAAMRAs7qAKCR8Ck8cuM9OnKr7dC+LnmPX6PAowCffD2T
XkZdo23fxDMxvqBHu3qyX6g=
=8c2Y
-----END PGP SIGNATURE-----