[Pkg-bazaar-maint] Bug#444775: bzr-svn: Can't push to SVN when a file has been created there

[Roland Mas]

Package: bzr-svn
Version: 0.4.3-1
Severity: normal

I have branched svn+https://svn.gforge.org/svn/gforge/trunk (no
anonymous access, but any account created on http://gforge.org/ will
be able to checkout read-only), and made some changes locally, merging
from SVN as time passes.  Now I can't seem to be able to push back to
SVN, and I get the following traceback:
,----
| roland at mirexpress:~/debian/gforge-trunk+bzr$ time bzr push 
| Using saved location: svn+https://svn.gforge.org/svn/gforge/trunk
| bzr: ERROR: libsvn._core.SubversionException: ("File '/svn/gforge/trunk/gforge/debian/po/de.po' already exists", 175005)
| 
| Traceback (most recent call last):
|   File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 800, in run_bzr_catch_errors
|     return run_bzr(argv)
|   File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 758, in run_bzr
|     ret = run(*run_argv)
|   File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases
|     return self.run(**all_cmd_args)
|   File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 813, in run
|     push_result = br_from.push(br_to, overwrite)
|   File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 127, in read_locked
|     return unbound(self, *args, **kwargs)
|   File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1531, in push
|     _override_hook_source_branch=_override_hook_source_branch)
|   File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1573, in _push_with_bound_branches
|     result = self._basic_push(target, overwrite, stop_revision)
|   File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1592, in _basic_push
|     target.update_revisions(self, stop_revision)
|   File "/home/roland/.bazaar/plugins/svn/branch.py", line 356, in update_revisions
|     push(self, other, revid)
|   File "/home/roland/.bazaar/plugins/svn/commit.py", line 674, in push
|     builder.commit(rev.message)
|   File "/home/roland/.bazaar/plugins/svn/commit.py", line 455, in commit
|     branch_batons[-1])
|   File "/home/roland/.bazaar/plugins/svn/commit.py", line 357, in _dir_process
|     self._dir_process(new_child_path, child_ie.file_id, child_baton)
|   File "/home/roland/.bazaar/plugins/svn/commit.py", line 357, in _dir_process
|     self._dir_process(new_child_path, child_ie.file_id, child_baton)
|   File "/home/roland/.bazaar/plugins/svn/commit.py", line 357, in _dir_process
|     self._dir_process(new_child_path, child_ie.file_id, child_baton)
|   File "/home/roland/.bazaar/plugins/svn/commit.py", line 256, in _dir_process
|     new_child_path), baton, None, -1, self.pool)
|   File "/home/roland/.bazaar/plugins/svn/errors.py", line 77, in convert
|     raise convert_error(e)
| SubversionException: ("File '/svn/gforge/trunk/gforge/debian/po/de.po' already exists", 175005)
| 
| bzr 0.91.0 on python 2.4.4.final.0 (linux2)
| arguments: ['/usr/bin/bzr', 'push']
| 
| ** please send this report to bazaar at lists.ubuntu.com
| 
| real    1m58.724s
| user    0m18.169s
| sys     0m1.084s
| roland at mirexpress:~/debian/gforge-trunk+bzr$ 
`----

My bzr branch is mirrored on Alioth:
http://alioth.debian.org/~lolando/bzr/gforge/upstream-svn/trunk/

I've discussed the matter with Jelmer Vernooij on IRC, but since he
hasn't found a fix yet and I'm going to be offline more often than not
in the coming few weeks, I'm submitting this as a bug report so it
doesn't get lost or forgotten.  I'm using a normal severity for now,
but I would like to add that this bug makes bzr-svn unusable for me in
that branch.

Roland.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-2-k7 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages bzr-svn depends on:
ii  bzr                         0.91-2       Bazaar, the next-generation distri
ii  python                      2.4.4-6      An interactive high-level object-o
ii  python-central              0.5.15       register and build utility for Pyt
ii  python-pysqlite2            2.3.5-1      python interface to SQLite 3
ii  python-subversion           1.4.4dfsg1-1 Python bindings for Subversion

Versions of packages bzr-svn recommends:
ii  bzr-rebase                    0.1-1      Rebase plugin for Bazaar

-- no debconf information