Pushing a branch merge fails if SVK merge properties are not found

[Lukáš Lalinský]

When trying to push to svn I get this traceback:

bzr: ERROR: exceptions.TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'

Traceback (most recent call last):
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/commands.py", line 781, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/commands.py", line 743, in run_bzr
    ret = run(*run_argv)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/commands.py", line 475, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/builtins.py", line 805, in run
    push_result = br_from.push(br_to, overwrite)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/decorators.py", line 127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/branch.py", line 1521, in push
    _override_hook_source_branch=_override_hook_source_branch)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/branch.py", line 1563, in _push_with_bound_branches
    result = self._basic_push(target, overwrite, stop_revision)
  File "/home/lukas/projects/bzr/bzr/bzr.dev/bzrlib/branch.py", line 1582, in _basic_push
    target.update_revisions(self, stop_revision)
  File "/home/lukas/.bazaar/plugins/svn/branch.py", line 325, in update_revisions
    push(self, other, rev_id)
  File "/home/lukas/.bazaar/plugins/svn/commit.py", line 663, in push
    base_tree.inventory)
  File "/home/lukas/.bazaar/plugins/svn/commit.py", line 93, in __init__
    self._record_merges(merges)
  File "/home/lukas/.bazaar/plugins/svn/commit.py", line 154, in _record_merges
    self._svnprops[SVN_PROP_SVK_MERGE] = old + new
TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'

Changing the default value from get_property from None to "" (like the get_property call for bzr-svn merge properties does) seems to fix it.

[Lukáš Lalinský (luks)]

Oh, sorry, I've noticed this is already fixed in the 0.4 branch.

[Jelmer Vernooij (jelmer)]

Thanks Lukáš, merged.

  status fixcommitted
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>