Comment 36 for bug 354036

when I try that script on an affected branch, I get

Traceback (most recent call last):
   File "/home/rmcbride/foo.py", line 3, in <module>
     b = bzrlib.branch.Branch.open(argv[1])
NameError: name 'argv' is not defined

I'm guessing there's a parameter I should be passing

Robert Collins wrote:
> On Thu, 2009-04-23 at 08:58 +0000, Nicola Larosa wrote:
>> Then we run "bzr push --overwrite" on both branches (the one being
>> merged, and the one receiving the merge), but the problem was still
>> there.
>
> This wouldn't fix the problem.
>
>> We then removed both branches from LP and pushed them again, but still
>> no luck.
>
> This should have. Have you tried my fix script?
>
> -Rob
>