[MERGE] Port across errors for shallow branch support.

[Aaron Bentley]

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

Robert Collins wrote:
> This patch contains the errors needed to add shallow branch support.

> +class NotStacked(BranchError):
> +
> +    _fmt = "The branch '%(branch)s' is not stacked."
> +
> +

Surely it's repositories that can fail to be stacked, not branches?

> +class UnstackableBranchFormat(BzrError):

> +class UnstackableRepositoryFormat(BzrError):
> +
> +    _fmt = ("The repository '%(url)s'(%(format)s) is not a stackable
format. "
> +        "You will need to upgrade the repository to permit branch
stacking.")

Why are both the repository format and the branch format required to be
stackable?

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

iD8DBQFHu6CD0F+nu1YWqI0RApSKAJ48v6aKMJmluGdOZSw+40zJkNiQKQCfZAps
W2jWrz0Nlw8oac04JsugwZg=
=bBcg
-----END PGP SIGNATURE-----