[PATCH] Latest bzr.dev fails to merge with revision spec

[John A Meinel]

In the latest bzr.dev code (I'm guessing it's because of Lalo's
changes), the cmd_merge code thinks it has a Branch object, when it
really has a string. The merge code itself wants the string, but an
intermediate function needs a Branch.

Attached is my workaround. I didn't bother to create a changeset, since
I currently don't have an integration branch.

Basically, the problem was a failure of the command:

bzr merge -r X..Y ../other-branch

Because it fails to lookup what the revisions X and Y mean.

This should also be accompanied by some tests, but I need to work on the
Transport code right now.

John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: bad-merge-revision.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20050916/4ea5a8b0/attachment.diff 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050916/4ea5a8b0/attachment.pgp