Bazaar Subversion Plugin

pull doesn't work after a change in the subversion URL

Bug #378799 reported by Servilio Afre Puentes on 2009-05-20

This bug affects 1 person

Affects		Status	Importance	Assigned to	Milestone
	Bazaar Subversion Plugin	Fix Released	High	Jelmer Vernooij

Bug Description

After removing an element from the path of the URL for the directory I push to, bzr ends both pull's and push'es with an exception. Output of relevant commands:

$ svn log -v -r 427:362
------------------------------------------------------------------------
r387 | servilio | 2009-03-02 19:37:03 -0500 (Mon, 02 Mar 2009) | 1 line
Changed paths:
   A /3rd_party (from /devel/3rd_party:386)
   A /buildouts (from /devel/buildouts:386)
   D /devel/3rd_party
   D /devel/buildouts
   D /devel/plone
   D /devel/trac
   A /plone (from /devel/plone:386)
   A /trac (from /devel/trac:386)

Moving the devel/ directory to the root of the repository.
------------------------------------------------------------------------
r362 | servilio | 2008-11-18 05:55:11 -0500 (Tue, 18 Nov 2008) | 1 line
Changed paths:
M /devel/buildouts/plone3-deployment
M /devel/buildouts/plone3-deployment/base.cfg

Adding 'Falculty/Staff Directory' product.
------------------------------------------------------------------------

Now the output of bzr pull:

$ bzr pull svn+ssh://develz.mcmaster.ca/srv/svn/devel/buildouts/plone3-deployment
bzr: ERROR: exceptions.AssertionError: Expected <CachingRevisionMetadata for revision 387, path buildouts/plone3-deployment in repository 'c133bc4f-f41c-0410-a8f9-f4ee1c8ca9d1'> got <CachingRevisionMetadata for revision 362, path devel/buildouts/plone3-deployment in repository 'c133bc4f-f41c-0410-a8f9-f4ee1c8ca9d1'>

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 729, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 924, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 560, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 960, in run
    local=local)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree.py", line 1574, in pull
    local=local)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 859, in pull
    possible_transports=possible_transports, *args, **kwargs)
  File "/home/servilio/.bazaar/plugins/svn/branch.py", line 693, in pull
    result.old_revmeta, _ = self.source.repository._get_revmeta(result.old_revid)
  File "/home/servilio/.bazaar/plugins/svn/repository.py", line 847, in _get_revmeta
    (uuid, branch, revnum), mapping = self.lookup_revision_id(revision_id)
  File "/home/servilio/.bazaar/plugins/svn/repository.py", line 927, in lookup_revision_id
    return self.revmap.get_branch_revnum(revid, layout, project)
  File "/home/servilio/.bazaar/plugins/svn/revids.py", line 235, in get_branch_revnum
    for entry_revid, branch, min_revno, max_revno, mapping in self.actual.discover_fileprop_revids(layout, last_checked, fileprops_to_revnum, project, pb):
  File "/home/servilio/.bazaar/plugins/svn/revids.py", line 103, in discover_fileprop_revids
    if revmeta.consider_bzr_fileprops():
  File "/home/servilio/.bazaar/plugins/svn/revmeta.py", line 775, in consider_bzr_fileprops
    self._consider_bzr_fileprops = (self.estimate_bzr_fileprop_ancestors() > 0)
  File "/home/servilio/.bazaar/plugins/svn/revmeta.py", line 467, in estimate_bzr_fileprop_ancestors
    return self._estimate_fileprop_ancestors("bzr:", estimate_bzr_ancestors)
  File "/home/servilio/.bazaar/plugins/svn/revmeta.py", line 461, in _estimate_fileprop_ancestors
    memoize=memoize)
  File "/home/servilio/.bazaar/plugins/svn/revmeta.py", line 430, in _fold_children_fileprops
    val = calc_final(lm.get_fileprops())
  File "/home/servilio/.bazaar/plugins/svn/revmeta.py", line 221, in get_fileprops
    lm = lm.get_direct_lhs_parent_revmeta()
  File "/home/servilio/.bazaar/plugins/svn/revmeta.py", line 311, in get_direct_lhs_parent_revmeta
    assert self == firstrevmeta, "Expected %r got %r" % (self, firstrevmeta)
AssertionError: Expected <CachingRevisionMetadata for revision 387, path buildouts/plone3-deployment in repository 'c133bc4f-f41c-0410-a8f9-f4ee1c8ca9d1'> got <CachingRevisionMetadata for revision 362, path devel/buildouts/plone3-deployment in repository 'c133bc4f-f41c-0410-a8f9-f4ee1c8ca9d1'>

bzr 1.15rc1 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'pull', 'svn+ssh://develz.mcmaster.ca/srv/svn/devel/buildouts/plone3-deployment']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_CA.UTF-8'
plugins:
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [1.15rc1]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [1.15rc1]
  rebase /home/servilio/.bazaar/plugins/rebase [0.4.5dev]
  stats /usr/lib/python2.5/site-packages/bzrlib/plugins/stats [unknown]
  svn /home/servilio/.bazaar/plugins/svn [0.6.1dev]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.