[MERGE] Give a more specific error when target branch is not reachable

[James Westby]

On Tue, 2008-07-29 at 09:46 -0500, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> James Westby wrote:
> | On Tue, 2008-07-29 at 11:20 +1000, Robert Collins wrote:
> |> How about
> |>
> |> +    _fmt = ("Your branch does not have all of the revisions required
> |> in "
> |> +            "order to merge this merge directive, however the target "
> |> +            "branch specified in the merge directive is not a branch: "
> |>                      ^location
> |>
> |> +            "%(location)s.")
> |>
> |> ?
> |
> | Good idea, done in the attached.
> |
> | Thanks,
> |
> | James
> |
> |
> 
> Is that a "however". It sounds more like an "also". Because you don't
> have enough revisions locally *and* we can't get them from the target.
> Which is different than *or* we can't get them from the target.
> 

I guess I went with however as the revisions not being present
is something bzr can handle, but the target branch not being a
branch isn't. I can change it to an "and" if you like.

> Oh, and what about the source? I thought the idea was that if the
> public_branch was accessible, we could pull needed revisions from the
> target or from the public branch. (That may not be implemented yet.)

The target branch is the only one that it tries in this codepath.

Thanks,

James