updating working copy fails when file already exists

[J. Navarro]

After branching a svn repository into a testing branch, I decided to push those changes -once stable- back into the original svn repository. Even though the svn repository now has the new revisions, bazaar crashed with:
bzr: ERROR: subvertpy.SubversionException: ("Failed to add file '/home/user/path/log': an unversioned file of the same name already exists", 155000)

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    attaching the crash file
        /home/user/.cache/crash/bzr-20100413171142-1946.crash
    and including a description of the problem.

    The crash file is plain text and you can inspect or edit it to remove
    private information.

[Jelmer Vernooij (jelmer)]

  status triaged
  importance low

Thanks for the bug report.

[Jelmer Vernooij (jelmer)]

bzr-svn should probably create a conflict in this case.