Bug#428757:
I think that we hit two things here. Output you requested: entering debugger /usr/lib/python2.4/site-packages/bzrlib/plugins/svn/fetch.py(261)close_file() - ie.symlink_target = lines[0][len(link ):] (Pdb) print lines [] (Pdb) This can be happening because a symbolic link pointing to outside of repository has been commited in bazaar repository. Maybe this exception is thrown because of this. Anyway I have made a sample session from scratch which IMHO shows that something is very wrong and this package is really unusable right now. tst:~$ mkdir test tst:~$ cd test #create empty svn repository tst:~/test$ mkdir svnrepo tst:~/test$ svnadmin create svnrepo #create empty bzr repository tst:~/test$ mkdir bzrrepo tst:~/test$ bzr init bzrrepo #create directory a1, commit and push to svn repo tst:~/test$ cd bzrrepo/ tst:~/test/bzrrepo$ mkdir a1 tst:~/test/bzrrepo$ bzr add a1 added a1 tst:~/test/bzrrepo$ bzr commit -m created a1 added a1 Committed revision 1. tst:~/test/bzrrepo$ bzr push file:///home/tomga/test/svnrepo Pushed up to revision 1. #create directory a2, commit and push to svn repo tst:~/test/bzrrepo$ mkdir a2 tst:~/test/bzrrepo$ bzr add a2 added a2 tst:~/test/bzrrepo$ bzr commit -m created a2 added a2 Committed revision 2. tst:~/test/bzrrepo$ bzr push file:///home/tomga/test/svnrepo bzr: ERROR: These branches have diverged. Try using merge and then push. #checkout svn repo and examin log tst:~/test/bzrrepo$ cd .. tst:~/test$ svn co file:///home/tomga/test/svnrepo svnco Asvnco/a1 U svnco Checked out revision 1. tst:~/test$ cd svnco tst:~/test/svnco$ svn log r1 | tomga | 2007-06-14 08:08:19 +0200 (Thu, 14 Jun 2007) | 1 line created a1 tst:~/test/svnco$ cd .. #merge bzr repo with svn repo - it seems that it incorrectly resolved common root tst:~/test$ cd bzrrepo/ tst:~/test/bzrrepo$ bzr merge file:///home/tomga/test/svnrepo +N a1/ -D a1/ All changes applied successfully. tst:~/test/bzrrepo$ bzr status removed: a1/ a2/ pending merges: tomga 2007-06-14 created a1 tst:~/test/bzrrepo$ I hope this helps. Regards Tomasz Gajewski
Bug#428757: bzr-svn: second 'bzr push' tells that branches have diverged
Package: bzr-svn Version: 0.3.3-1 Severity: grave Justification: renders package unusable Second push to svn repository tells that branches have diverged. I have a quite big source repository in bazaar and I'm trying to migrate everyting to svn (company decision) using bzr-svn. I have executed: svnadmin create svn repo bzr branch svn repo bzr pull -r 1 bzr repo bzr push svn repo bzr pull -r 2 bzr repo bzr push svn repo Here I receive: bzr: ERROR: These branches have diverged. Try using merge and then push. And after executing: bzr merge svn repo i get: bzr: ERROR: exceptions.IndexError: list index out of range Traceback (most recent call last): File /usr/lib/python2.4/site-packages/bzrlib/commands.py, line 650, in run_bzr_catch_errors return run_bzr(argv) File /usr/lib/python2.4/site-packages/bzrlib/commands.py, line 612, in run_bzr ret = run(*run_argv) File /usr/lib/python2.4/site-packages/bzrlib/commands.py, line 304, in run_argv_aliases return self.run(**all_cmd_args) File /usr/lib/python2.4/site-packages/bzrlib/builtins.py, line 2585, in run change_reporter=change_reporter) File /usr/lib/python2.4/site-packages/bzrlib/builtins.py, line 3561, in _merge_helper merger.set_other(other_revision) File /usr/lib/python2.4/site-packages/bzrlib/merge.py, line 217, in set_other self.this_branch) File /usr/lib/python2.4/site-packages/bzrlib/merge.py, line 68, in _get_tree return branch, _get_revid_tree(branch, revision_id, local_branch) File /usr/lib/python2.4/site-packages/bzrlib/merge.py, line 77, in _get_revid_tree local_branch.fetch(branch, revision_id) File /usr/lib/python2.4/site-packages/bzrlib/decorators.py, line 165, in write_locked return unbound(self, *args, **kwargs) File /usr/lib/python2.4/site-packages/bzrlib/branch.py, line 241, in fetch pb=nested_pb) File /usr/lib/python2.4/site-packages/bzrlib/repository.py, line 331, in fetch return inter.fetch(revision_id=revision_id, pb=pb) File /usr/lib/python2.4/site-packages/bzrlib/plugins/svn/fetch.py, line 445, in fetch self.copy_content(revision_id=revision_id, pb=pb) File /usr/lib/python2.4/site-packages/bzrlib/plugins/svn/fetch.py, line 430, in copy_content pool) File /var/lib/python-support/python2.4/libsvn/ra.py, line 738, in svn_ra_reporter2_invoke_finish_report return apply(_ra.svn_ra_reporter2_invoke_finish_report, args) File /usr/lib/python2.4/site-packages/bzrlib/plugins/svn/fetch.py, line 261, in close_file ie.symlink_target = lines[0][len(link ):] IndexError: list index out of range bzr 0.15.0 on python 2.4.4.final.0 (linux2) arguments: ['/usr/bin/bzr', 'merge', 'svn repo'] ** please send this report to [EMAIL PROTECTED] END That makes the package unusable. Regards Tomasz Gajewski -- System Information: Debian Release: testing/unstable APT prefers testing APT policy: (900, 'testing'), (800, 'unstable') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.18-tg Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Versions of packages bzr-svn depends on: ii bzr 0.15-1 bazaar-ng, the next-generation dis ii python 2.4.4-6 An interactive high-level object-o ii python-central 0.5.14 register and build utility for Pyt ii python-subversion 1.4.2dfsg1-2 Python bindings for Subversion Versions of packages bzr-svn recommends: ii python-pysqlite2 2.3.3-2python interface to SQLite 3 -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#428757: [Pkg-bazaar-maint] Bug#428757: bzr-svn: second 'bzr push' tells that branches have diverged
severity normal thanks This renders the package unusable for you, but it only occurs in very specific situations. On Thu, 2007-06-14 at 00:30 +0200, Tomasz Gajewski wrote: Package: bzr-svn Version: 0.3.3-1 Severity: grave Justification: renders package unusable Second push to svn repository tells that branches have diverged. I have a quite big source repository in bazaar and I'm trying to migrate everyting to svn (company decision) using bzr-svn. I have executed: svnadmin create svn repo bzr branch svn repo bzr pull -r 1 bzr repo bzr push svn repo bzr pull -r 2 bzr repo bzr push svn repo Here I receive: bzr: ERROR: These branches have diverged. Try using merge and then push. And after executing: bzr merge svn repo i get: bzr: ERROR: exceptions.IndexError: list index out of range Traceback (most recent call last): File /usr/lib/python2.4/site-packages/bzrlib/commands.py, line 650, in run_bzr_catch_errors return run_bzr(argv) File /usr/lib/python2.4/site-packages/bzrlib/commands.py, line 612, in run_bzr ret = run(*run_argv) File /usr/lib/python2.4/site-packages/bzrlib/commands.py, line 304, in run_argv_aliases return self.run(**all_cmd_args) File /usr/lib/python2.4/site-packages/bzrlib/builtins.py, line 2585, in run change_reporter=change_reporter) File /usr/lib/python2.4/site-packages/bzrlib/builtins.py, line 3561, in _merge_helper merger.set_other(other_revision) File /usr/lib/python2.4/site-packages/bzrlib/merge.py, line 217, in set_other self.this_branch) File /usr/lib/python2.4/site-packages/bzrlib/merge.py, line 68, in _get_tree return branch, _get_revid_tree(branch, revision_id, local_branch) File /usr/lib/python2.4/site-packages/bzrlib/merge.py, line 77, in _get_revid_tree local_branch.fetch(branch, revision_id) File /usr/lib/python2.4/site-packages/bzrlib/decorators.py, line 165, in write_locked return unbound(self, *args, **kwargs) File /usr/lib/python2.4/site-packages/bzrlib/branch.py, line 241, in fetch pb=nested_pb) File /usr/lib/python2.4/site-packages/bzrlib/repository.py, line 331, in fetch return inter.fetch(revision_id=revision_id, pb=pb) File /usr/lib/python2.4/site-packages/bzrlib/plugins/svn/fetch.py, line 445, in fetch self.copy_content(revision_id=revision_id, pb=pb) File /usr/lib/python2.4/site-packages/bzrlib/plugins/svn/fetch.py, line 430, in copy_content pool) File /var/lib/python-support/python2.4/libsvn/ra.py, line 738, in svn_ra_reporter2_invoke_finish_report return apply(_ra.svn_ra_reporter2_invoke_finish_report, args) File /usr/lib/python2.4/site-packages/bzrlib/plugins/svn/fetch.py, line 261, in close_file ie.symlink_target = lines[0][len(link ):] IndexError: list index out of range This looks like a svn:special file that has invalid contents. Can you run this command inside pdb: BZR_PDB=1 bzr merge svn repo and when it enters pdb print the contents of lines: pdb print lines That will be useful tracking this bug down. Cheers, Jelmer -- Jelmer Vernooij [EMAIL PROTECTED] - http://samba.org/~jelmer/ signature.asc Description: This is a digitally signed message part
