Assertion in _set_direct_lhs_parent_revmeta when pulling from remote branch

Bug #384192 reported by Jean-Francois Roy
42
This bug affects 5 people
Affects Status Importance Assigned to Milestone
Bazaar Subversion Plugin
Fix Released
Medium
Jelmer Vernooij

Bug Description

The following exception occurred when I tried to pull from the parent remote branch. Just prior to the pull command, I deleted from my local repository the branch labeled in the trace as <branch2>, which is a child branch of the branch I was trying to pull and which was later merged into the branch I was trying to pull.

This is similar, but slightly different, than lp:324970.

bzr: ERROR: exceptions.AssertionError: Tried registering <CachingRevisionMetadata for revision 12243, path <prefix>/<project>/branches/<branch2> in repository 'be02940b-5f7b-422b-ba6c-1eb93f4884eb'> as parent while None already was parent for <CachingRevisionMetadata for revision 12245, path <prefix>/<project>/branches/<branch2> in repository 'be02940b-5f7b-422b-ba6c-1eb93f4884eb'>

Traceback (most recent call last):
  File "/Library/Python/2.6/site-packages/bzrlib/commands.py", line 729, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/Library/Python/2.6/site-packages/bzrlib/commands.py", line 924, in run_bzr
    ret = run(*run_argv)
  File "/Library/Python/2.6/site-packages/bzrlib/commands.py", line 560, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/Library/Python/2.6/site-packages/bzrlib/builtins.py", line 964, in run
    local=local)
  File "/Library/Python/2.6/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/Library/Python/2.6/site-packages/bzrlib/branch.py", line 855, in pull
    possible_transports=possible_transports, *args, **kwargs)
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/branch.py", line 716, in pull
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/branch.py", line 654, in update_revisions
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/fetch.py", line 1223, in fetch
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/fetch.py", line 1031, in find_until
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/fetch.py", line 988, in find_mainline
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/repository.py", line 752, in _iter_reverse_revmeta_mapping_history
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/revmeta.py", line 934, in next
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/revmeta.py", line 989, in next
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/revmeta.py", line 1382, in convert
  File "/Volumes/Crossroads/bahamut/.bazaar/plugins/svn/revmeta.py", line 283, in _set_direct_lhs_parent_revmeta
AssertionError: Tried registering <CachingRevisionMetadata for revision 12243, path <prefix>/<project>/branches/<branch2> in repository 'be02940b-5f7b-422b-ba6c-1eb93f4884eb'> as parent while None already was parent for <CachingRevisionMetadata for revision 12245, path <prefix>/<project>/branches/<branch2> in repository 'be02940b-5f7b-422b-ba6c-1eb93f4884eb'>

bzr 1.16dev on python 2.6.1 (darwin)
arguments: ['/usr/local/bin/bzr', 'pull']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
  keychain_credential_store /Users/bahamut/.bazaar/plugins/keychain_credential_store [0.1dev]
  launchpad /Library/Python/2.6/site-packages/bzrlib/plugins/launchpad [1.16dev]
  netrc_credential_store /Library/Python/2.6/site-packages/bzrlib/plugins/netrc_credential_store [1.16dev]
  qbzr /Users/bahamut/.bazaar/plugins/qbzr [0.10dev]
  rebase /Users/bahamut/.bazaar/plugins/rebase [0.5.1dev]
  svn /Users/bahamut/.bazaar/plugins/svn [0.6.2dev]

Revision history for this message
Jean-Francois Roy (jeanfrancois.roy) wrote :

I was able to work around the problem by deleting the entire repository and branching from scratch. So it's probably not directly related to the bzr metadata in the remote svn repository.

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 384192] [NEW] Assertion in _set_direct_lhs_parent_revmeta when pulling from remote branch

Was the original repository created with a bzr-svn from before 0.6.1 ?

--
Jelmer Vernooij <email address hidden> - http://jelmer.vernstok.nl/

Revision history for this message
Jean-Francois Roy (jeanfrancois.roy) wrote :

No, it was created with 0.6.2, latest revision as far as I can remember. Maybe a few days old from now.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

What's the svn log for revision 12245 ? Is it a revision created with bzr?

Changed in bzr-svn:
status: New → Incomplete
Revision history for this message
Jean-Francois Roy (jeanfrancois.roy) wrote :

Attached the revprop xml. The revision was created with bzr-svn.

Jelmer Vernooij (jelmer)
Changed in bzr-svn:
status: Incomplete → Triaged
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
milestone: none → 1.0.1
importance: Undecided → Medium
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
milestone: 1.0.1 → 1.0.3
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
milestone: 1.0.3 → 1.0.4
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

This has been fixed - confirmed against the sit branch that michael mentioned.

If you can still reproduce it with lp:bzr-svn, please open a new bug report.

Changed in bzr-svn:
status: Triaged → Fix Committed
assignee: nobody → Jelmer Vernooij (jelmer)
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Bug attachments

Remote bug watches

Bug watches keep track of this bug in other bug trackers.