ERROR: exceptions.TypeError: merge_text() takes exactly 2 arguments (3 given)

[Daniel Holbach]

daniel@bert:~$ bzr branch lp:ubuntu/protobuf
Branched 11 revision(s).
daniel@bert:~$ cd protobuf/
daniel@bert:~/protobuf$ ls
daniel@bert:~/protobuf$ bzr merge-package lp:~statik/ubuntu/lucid/protobuf/merge-bug502654
bzr: ERROR: No such tag: upstream-2.2.0a
daniel@bert:~/protobuf$ bzr merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654
Warning: criss-cross merge encountered. See bzr help criss-cross.
bzr: ERROR: exceptions.TypeError: merge_text() takes exactly 2 arguments (3 given)

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    attaching the crash file
        /home/daniel/.cache/crash/bzr-20100215090245-9455.crash
    and including a description of the problem.

    The crash file is plain text and you can inspect or edit it to remove
    private information.
daniel@bert:~/protobuf$

[Daniel Holbach (dholbach)]

This seems to be a problem in a lot more cases?

daniel@bert:~$ bzr branch lp:ubuntu/bluez
Branched 38 revision(s).
daniel@bert:~$ cd bluez/
daniel@bert:~/bluez$ bzr merge-package lp:~bmillemathias/ubuntu/lucid/bluez/main
bzr: ERROR: No such tag: upstream-4.60
daniel@bert:~/bluez$ bzr merge lp:~bmillemathias/ubuntu/lucid/bluez/main
bzr: ERROR: exceptions.TypeError: merge_text() takes exactly 2 arguments (3 given)

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    attaching the crash file
        /home/daniel/.cache/crash/bzr-20100215090806-9563.crash
    and including a description of the problem.

    The crash file is plain text and you can inspect or edit it to remove
    private information.
daniel@bert:~/bluez$