Package: bzr-svn Version: 1.1.0~bzr3767-1 Severity: normal I'm using Bazaar as my Subversion client for the FusionForge repository, over svn+ssh://. While trying to commit a merge revision today, I encountered a traceback. Steps to reproduce (from my side):
$ bzr checkout svn+ssh://scm.fusionforge.org/srv/svn/fusionforge/trunk $ bzr checkout svn+ssh://scm.fusionforge.org/srv/svn/fusionforge/branches/Branch_5_1 $ cd trunk $ bzr missing --long -v --other ../Branch_5_1 You are missing 5 revision(s): ------------------------------------------------------------ revno: 10321 committer: Roland Mas <lola...@debian.org> branch nick: branches/Branch_5_1 timestamp: Wed 2011-08-24 15:50:30 +0200 message: PHP notice modified: src/common/include/tag_cloud.php ------------------------------------------------------------ revno: 10320 committer: Roland Mas <lola...@debian.org> branch nick: branches/Branch_5_1 timestamp: Wed 2011-08-24 15:18:06 +0200 message: Only run the PFO-RBAC once to save time (since only the last one is effective anyway) modified: src/db/20100518-pfo-rbac.sql src/db/20100524-pfo-rbac.sql src/db/20100610-pfo-rbac.sql src/db/20100926-pfo-rbac.sql src/db/20100927-pfo-rbac.sql src/db/20101021-pfo-rbac.sql ------------------------------------------------------------ revno: 10319 committer: Roland Mas <lola...@debian.org> branch nick: branches/Branch_5_1 timestamp: Wed 2011-08-24 14:50:01 +0200 message: Harmonize translatable string modified: src/www/include/project_home.php ------------------------------------------------------------ revno: 10318 committer: Roland Mas <lola...@debian.org> branch nick: branches/Branch_5_1 timestamp: Wed 2011-08-24 14:45:57 +0200 message: A few French translations modified: src/translations/fr.po ------------------------------------------------------------ revno: 10317 committer: Roland Mas <lola...@debian.org> branch nick: branches/Branch_5_1 timestamp: Wed 2011-08-24 14:24:44 +0200 message: Refreshed gettext files modified: src/translations/bg.po src/translations/ca.po src/translations/de.po src/translations/el.po src/translations/en.po src/translations/eo.po src/translations/es.po src/translations/eu.po src/translations/fr.po src/translations/fusionforge.pot src/translations/gl.po src/translations/he.po src/translations/id.po src/translations/it.po src/translations/ja.po src/translations/ko.po src/translations/la.po src/translations/nb.po src/translations/nl.po src/translations/pl.po src/translations/pt.po src/translations/pt_BR.po src/translations/ru.po src/translations/sv.po src/translations/th.po src/translations/zh_CN.po src/translations/zh_TW.po $ bzr merge -r 10317 ../Branch_5_1/ M src/translations/bg.po M src/translations/ca.po M src/translations/de.po M src/translations/el.po M src/translations/en.po M src/translations/eo.po M src/translations/es.po M src/translations/eu.po M src/translations/fr.po M src/translations/fusionforge.pot M src/translations/gl.po M src/translations/he.po M src/translations/id.po M src/translations/it.po M src/translations/ja.po M src/translations/ko.po M src/translations/la.po M src/translations/nb.po M src/translations/nl.po M src/translations/pl.po M src/translations/pt.po M src/translations/pt_BR.po M src/translations/ru.po M src/translations/sv.po M src/translations/th.po M src/translations/zh_CN.po M src/translations/zh_TW.po All changes applied successfully. $ $ bzr status -v modified: src/translations/bg.po src/translations/ca.po src/translations/de.po src/translations/el.po src/translations/en.po src/translations/eo.po src/translations/es.po src/translations/eu.po src/translations/fr.po src/translations/fusionforge.pot src/translations/gl.po src/translations/he.po src/translations/id.po src/translations/it.po src/translations/ja.po src/translations/ko.po src/translations/la.po src/translations/nb.po src/translations/nl.po src/translations/pl.po src/translations/pt.po src/translations/pt_BR.po src/translations/ru.po src/translations/sv.po src/translations/th.po src/translations/zh_CN.po src/translations/zh_TW.po pending merges: Roland Mas 2011-08-24 Refreshed gettext files $ bzr commit -m"Merged from 5.1: Refreshed gettext files" Committing to: svn+ssh://scm.fusionforge.org/srv/svn/fusionforge/trunk modified src/translations/bg.po modified src/translations/ca.po modified src/translations/de.po modified src/translations/el.po modified src/translations/en.po modified src/translations/eo.po modified src/translations/es.po modified src/translations/eu.po modified src/translations/fr.po modified src/translations/fusionforge.pot modified src/translations/gl.po modified src/translations/he.po modified src/translations/id.po modified src/translations/it.po modified src/translations/ja.po modified src/translations/ko.po modified src/translations/la.po modified src/translations/nb.po modified src/translations/nl.po modified src/translations/pl.po modified src/translations/pt.po modified src/translations/pt_BR.po modified src/translations/ru.po modified src/translations/sv.po modified src/translations/th.po modified src/translations/zh_CN.po modified src/translations/zh_TW.po bzr: ERROR: subvertpy.SubversionException: ("File not found: revision 14216, path '/branches/Branch_5_1/src/translations/gforge.pot'", 160013) Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 946, in exception_to_return_code return the_callable(*args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1150, in run_bzr ret = run(*run_argv) File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 699, in run_argv_aliases return self.run(**all_cmd_args) File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 721, in run return self._operation.run_simple(*args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple self.cleanups, self.func, *args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups result = func(*args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3316, in run lossy=lossy) File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 217, in write_locked result = unbound(self, *args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 209, in commit result = WorkingTree.commit(self, message, revprops, *args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 217, in write_locked result = unbound(self, *args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/mutabletree.py", line 210, in commit *args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 289, in commit lossy=lossy) File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 131, in run self.cleanups, self.func, self, *args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups result = func(*args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 457, in _commit self.branch, new_revno, self.rev_id, lossy=lossy) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/branch.py", line 521, in import_last_revision_info_and_tags revno, revid, lossy=lossy) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/branch.py", line 516, in import_last_revision_info overwrite=False, push_metadata=not lossy, append_revisions_only=True) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/push.py", line 355, in push_todo push_metadata=push_metadata) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/push.py", line 392, in push_revision_series project=project, layout=layout) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/push.py", line 410, in push_revision_inclusive base_foreign_info=base_foreign_info) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/push.py", line 440, in push_single_revision root_action=root_action) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/push.py", line 169, in push_revision_tree old_tree, base_tree.get_revision_id(), iter_changes): File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/commit.py", line 949, in record_iter_changes new_ie, parent_trees) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/commit.py", line 889, in _get_text_revision ptree.get_file_sha1(new_ie.file_id) == new_ie.text_sha1) or File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/tree.py", line 283, in get_file_sha1 return osutils.sha_string(self.get_file_text(file_id, path)) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/tree.py", line 315, in get_file_text my_file = self.get_file(file_id, path) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/tree.py", line 308, in get_file stream, self._revmeta.metarev.revnum) File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/transport.py", line 520, in get_file return conn.get_file(relpath, stream, revnum) SubversionException: ("File not found: revision 14216, path '/branches/Branch_5_1/src/translations/gforge.pot'", 160013) bzr 2.4.0 on python 2.6.7 (Linux-3.0.0-1-686-pae-i686-with-debian-wheezy-sid) arguments: ['/usr/bin/bzr', 'commit', '-mMerged from 5.1: Refreshed gettext files'] plugins: bash_completion[2.4.0], bookmarks[2.3.0dev], bzrtools[2.4.0], changelog_merge[2.4.0], dbus[0.1.0dev], email[unknown], extcommand[unknown], fastimport[0.11.0], grep[0.4.0], launchpad[2.4.0], netrc_credential_store[2.4.0], news_merge[2.4.0], qbzr[0.21.0], rewrite[0.6.3dev], svn[1.1.0dev], weave_fmt[2.4.0] encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'fr_FR.utf8' *** 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 including this traceback and a description of the problem. $ The branches can be accessed anonymously at svn://scm.fusionforge.org/scmrepos/svn/fusionforge/trunk and .../branches/Branch_5_1 if you want to look at the repository. It's quite possible that the metadata stored there is inconsistent, since I've been using bzr-svn on it for years, so maybe some old bugs are only now making themselves known. Thanks, Roland. -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 3.0.0-1-686-pae (SMP w/1 CPU core) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages bzr-svn depends on: ii bzr 2.4.0-1 easy to use distributed version co ii python 2.6.7-3 interactive high-level object-orie ii python-subvertpy 0.8.5-1 Alternative Python bindings for Su ii python2.6 2.6.7-4 An interactive high-level object-o ii python2.7 2.7.2-5 An interactive high-level object-o Versions of packages bzr-svn recommends: ii python-tdb 1.2.9-3 Python bindings for TDB ii python-xdg 0.19-3 Python library to access freedeskt Versions of packages bzr-svn suggests: ii bzr-rewrite 0.6.2+bzr237-1 History rewriting plugin for Bazaa -- no debconf information -- Roland Mas Sauvez une souris, mangez votre chat. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org