Bazaar

  1. Bug #515597
  2. Comment #1

Comment 1 for bug 515597

Revision history for this message
Vincent Ladeuil (vila) wrote :

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