mpatch.mpatchError: patch cannot be decoded

[Dj Gilcrease]

When I try to "hg merge tip" on my Ubuntu box I am getting

  File "/usr/local/lib/python2.6/dist-packages/mercurial/hg.py", line
348, in merge
    stats = _merge.update(repo, node, True, force, False)
  File "/usr/local/lib/python2.6/dist-packages/mercurial/merge.py",
line 429, in update
    if p1.branch() != p2.branch():
  File "/usr/local/lib/python2.6/dist-packages/mercurial/context.py",
line 101, in branch
    def branch(self): return self._changeset[5].get("branch")
  File "/usr/local/lib/python2.6/dist-packages/mercurial/util.py",
line 150, in __get__
    result = self.func(obj)
  File "/usr/local/lib/python2.6/dist-packages/mercurial/context.py",
line 59, in _changeset
    return self._repo.changelog.read(self.node())
  File "/usr/local/lib/python2.6/dist-packages/mercurial/changelog.py",
line 175, in read
    text = self.revision(node)
  File "/usr/local/lib/python2.6/dist-packages/mercurial/revlog.py",
line 999, in revision
    text = mdiff.patches(text, bins)
mpatch.mpatchError: patch cannot be decoded

It works on my windows box so I am a little baffled

Dj Gilcrease
OpenRPG Developer
~~http://www.openrpg.com