[Pkg-bazaar-maint] Bug#428757: Bug#428757: bzr-svn: second 'bzr push' tells that branches have diverged

[Jelmer Vernooij]

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 <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: This is a digitally signed message part
Url : http://lists.alioth.debian.org/pipermail/pkg-bazaar-maint/attachments/20070614/7d588b0e/attachment.pgp