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

[Vincent Ladeuil]

Once again, untested code is broken code:

  File "/home/vila/src/bzr/releases/2.1.0/bzrlib/merge.py", line 765, in __init__
    self.do_merge()
  File "/home/vila/src/bzr/releases/2.1.0/bzrlib/merge.py", line 775, in do_merge
    self._compute_transform()
  File "/home/vila/src/bzr/releases/2.1.0/bzrlib/merge.py", line 822, in _compute_transform
    file_status = self._do_merge_contents(file_id)
  File "/home/vila/src/bzr/releases/2.1.0/bzrlib/merge.py", line 1310, in _do_merge_contents
    hook_status, lines = hook.merge_contents(params)
  File "/home/vila/src/bzr/releases/2.1.0/bzrlib/merge.py", line 163, in merge_contents
    return self.merge_text(self, params)
TypeError: merge_text() takes exactly 2 arguments (3 given)

Fix available in the associated branch

[Vincent Ladeuil (vila)]

Bah, sorry for the incomplete description: the fix is trivial, an unfortunate typo:

    return self.merge_text(self, params)

should be

    return self.merge_text(params)

It looks like I can't associate a branch to a bug anymore... weird. Anyway, the merge proposal is at https://code.edge.launchpad.net/~vila/bzr/2.1.0-fixes/+merge/18397