[MERGE] Give a more specific error when target branch is not reachable
John Arbash Meinel
john at arbash-meinel.com
Tue Jul 29 15:46:41 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
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)s.")
| Good idea, done in the attached.
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.
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.)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar