[PATCH] Latest bzr.dev fails to merge with revision spec
robertc at robertcollins.net
Fri Sep 16 15:35:53 BST 2005
On Fri, 2005-09-16 at 10:22 -0400, John A Meinel wrote:
> 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.
I think this is already fixed in integration.
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050917/813d4f6b/attachment.pgp
More information about the bazaar