[MERGE] Exception when pulling from a location

[Aaron Bentley]

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

John Arbash Meinel wrote:
> We have a small bug in how 'bzr pull XXX' works. Basically, the first
> thing we do is check to see if it is a 'mergeable' (aka bundle)

nitpick: (aka bundle or merge directive)

And it's hardly ever a bundle these days.

> Ultimately, I think our logic is probably backwards. We should try to do
> "Branch.open()" first, and then try "read_mergeable_from_url"
> afterwards.

If you do Branch.open, followed by read_mergeable_from_url, the result
should be the same as if you do read_mergeable_from_url, then Branch.open.

Why is one backwards and the other not?

> I think the reason we did it this way was because of
> "Branch.open_containing()". If you supplied the path to a bundle, we
> wouldn't want to open the containing branch.

That's right, and it's more acute for the merge command, because you can
specify a file to merge, so Branch.open_containing must be used.

In the case where the specified file is versioned, and is a merge
directive, should merge treat it as a versioned file, or as a merge
directive?

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

iEYEARECAAYFAkmMxeQACgkQ0F+nu1YWqI0rPACdHm5L/CZsmO5wxeLBVFr7L8+i
T80AnA2+t2i3PAFR4z4Ytb+RWMDNy3Y/
=XCva
-----END PGP SIGNATURE-----