[PATCH] Latest bzr.dev fails to merge with revision spec
John A Meinel
john at arbash-meinel.com
Sat Sep 17 16:27:48 BST 2005
Robert Collins wrote:
> 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.
I checked again, I think this is a different bug. I'm going to branch my
own integration branch off of yours, so that I have a place to submit my
The bug I saw fixed in integration was that "bzr diff -r" did the wrong
thing. This is a bug in the bzr merge code.
Anyway, there are quite a few places in the code where it isn't handling
revision stuff quite right.
Specifically, trying to instantiate a RevisionSpec object when you
already have one causes a weird error (it actually tries to int() the
object, which throws a TypeError instead of ValueError, and is not handled).
Right now "bzr branch -r X" is also broken because of this. (Otherwise
the new RevisionSpec code is pretty nice, better than my old code).
You can find my new branch at:
I've applied this, and a few other patches, which make bzr useful again
for my needs.
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050917/d72f0700/attachment.pgp
More information about the bazaar