Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 920, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1131, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 695, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 1221, in run
    local=local, show_base=show_base)
  File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 218, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree.py", line 1008, in pull
    show_base=show_base)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 2021, in merge_inner
    return merger.do_merge()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 686, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 654, in _do_merge_to
    merge.do_merge()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 802, in do_merge
    operation.run()
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 132, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 807, in _do_merge
    self._compute_transform()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 857, in _compute_transform
    self._finish_computing_transform()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 867, in _finish_computing_transform
    lambda t, c: transform.conflict_pass(t, c, self.other_tree))
  File "/usr/lib/python2.7/dist-packages/bzrlib/transform.py", line 3033, in resolve_conflicts
    raise MalformedTransform(conflicts=conflicts)
MalformedTransform: Tree transform is malformed [('versioning no contents', 'new-451')]