Merged revisions not present on separate checkout.

Bug #513708 reported by Per Johansson on 2010-01-28
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar Subversion Plugin
Undecided
Unassigned

Bug Description

Here's a set of instructions that will break bzr checkouts of svn branches. When trying to reproduce it I could only get the error on bzr annotate, but in the real branch I got it on bzr diff. The problem is that merged revisions are not available, and i guess it's not completely easy to fixed, except to use a shared repository where the original branch is also available. That might not always be an option, however.

Steps to reproduce:

svnadmin create svn
svn co file://`pwd`/svn svnco
cd svnco
svn mkdir trunk
svn ci -m 'added trunk'
cd ..

bzr init bzr
cd bzr
echo "test" > test
bzr add
bzr ci -m 'test'
cd ..

bzr co file://`pwd`/svn/trunk bzrco
cd bzrco
bzr merge -r0..-1 ../bzr
bzr ci -m 'merged bzr'
cd ..

bzr co file://`pwd`/svn/trunk bzrco2
cd bzrco2
bzr annotate test

This will produce:
bzr: ERROR: Revision {('test-20100128102111-e9x904zgqib713xd-1', '<email address hidden>')} not present in "<bzrlib.groupcompress.GroupCompressVersionedFiles object at 0x11b9d5d0>".

Thu 2010-01-28 10:21:12 +0000
0.035 bzr arguments: [u'annotate', u'test']
0.047 looking for plugins in /home/pelle/.bazaar/plugins
0.108 looking for plugins in /usr/local/python/lib/python2.6/site-packages/bzrlib/plugins
0.157 opening working tree '/home/pelle/test/bzrco2'
0.168 Traceback (most recent call last):
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/commands.py", line 1052, in ignore_pipe
    result = func(*args, **kwargs)
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/builtins.py", line 4425, in run
    show_ids=show_ids)
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/annotate.py", line 89, in annotate_file_tree
    annotations = list(tree.annotate_iter(file_id))
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/workingtree.py", line 525, in annotate_iter
    for key, line in annotator.annotate_flat(this_key)]
  File "_annotator_pyx.pyx", line 275, in bzrlib._annotator_pyx.Annotator.annotate_flat
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/_annotator_py.py", line 258, in annotate
    for text_key, text, num_lines in self._get_needed_texts(key, pb=pb):
  File "/usr/local/python/lib/python2.6/site-packages/bzrlib/_annotator_py.py", line 118, in _get_needed_texts
    raise errors.RevisionNotPresent(record.key, self._vf)
RevisionNotPresent: Revision {('test-20100128102111-e9x904zgqib713xd-1', '<email address hidden>')} not present in "<bzrlib.groupcompress.GroupCompressVersionedFiles object at 0x11b9d5d0>".

To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers