TypeError: merge_text() takes exactly 2 arguments (3 given)

Bug #521546 reported by Colin Watson
10
This bug affects 2 people
Affects Status Importance Assigned to Milestone
bzr (Ubuntu)
New
Undecided
Unassigned

Bug Description

Binary package hint: bzr-builddeb

I upgraded to today's bzr and bzr-builddeb in Lucid and tried to 'bzr merge-package lp:debian/dpkg' into lp:ubuntu/dpkg. It fell over with the attached crash dump.

Revision history for this message
Colin Watson (cjwatson) wrote :
Revision history for this message
Colin Watson (cjwatson) wrote :

Actually, I just looked at the crash dump in more detail and it's obvious that this is a bzr bug.

affects: bzr-builddeb (Ubuntu) → bzr (Ubuntu)
Revision history for this message
Colin Watson (cjwatson) wrote :

This was fixed in r4797.9.1 of bzr.dev. A backport would be nice if there isn't going to be a new upstream release ASAP ...

Revision history for this message
Michael Bienia (geser) wrote :

The (fixed) bzr bug for this is bug #515597.

Revision history for this message
Andrew Bennetts (spiv) wrote :

As Michael points out, this is bug 515597, which has been fixed on the 2.1 branch already, and should be part of 2.1.0 final (even if there are no further release candidates).

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 521546] Re: TypeError: merge_text() takes exactly 2 arguments (3 given)

Hi Martin,

On Sun, 2010-02-14 at 00:06 +0000, Colin Watson wrote:
> This was fixed in r4797.9.1 of bzr.dev. A backport would be nice if
> there isn't going to be a new upstream release ASAP ...
For when is the next 2.1 rc / final planned?

Cheers,

Jelmer

Revision history for this message
Robert Collins (lifeless) wrote :

 duplicate 515597

Revision history for this message
Martin Pool (mbp) wrote : Re: [Bug 521546] Re: TypeError: merge_text() takes exactly 2 arguments (3 given)

On 15 February 2010 00:17, Jelmer Vernooij <email address hidden> wrote:
> Hi Martin,
>
> On Sun, 2010-02-14 at 00:06 +0000, Colin Watson wrote:
>> This was fixed in r4797.9.1 of bzr.dev.  A backport would be nice if
>> there isn't going to be a new upstream release ASAP ...
> For when is the next 2.1 rc / final planned?

It was planned for Friday, but something came up and John didn't do it
then. I think he will do it early this week. As Andrew says, bug
515597
should be fixed in final.

I'm fairly sure the bug was never in 2.0 so the fix need not be backported.
--
Martin <http://launchpad.net/~mbp/>

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.