When pulling from a feature branch to a checkout, the following error occurs. It is normal that it does not work (I should use "merge" instead) but a nice explanation would be better.
bzr: ERROR: exceptions.AssertionError: Tried registering <CachingRevisionMetadata for revision 174, path in repository 'a37b5e43-4b7f-4128-9b7a-df1949a3dd69'> as parent while <CachingRevisionMetadata for revision 165, path in repository 'a37b5e43-4b7f-4128-9b7a-df1949a3dd69'> already was parent for <CachingRevisionMetadata for revision 177, path trunk in repository 'a37b5e43-4b7f-4128-9b7a-df1949a3dd69'>
Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 853, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1055, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 661, in run_argv_aliases
return self.run_direct(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 665, in run_direct
return self._operation.run_simple(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 1013, in run
possible_transports=possible_transports, local=local)
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 194, in write_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree.py", line 1614, in pull
local=local)
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 194, in write_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 962, in pull
possible_transports=possible_transports, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 3196, in pull
run_hooks=False)
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 194, in write_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 962, in pull
possible_transports=possible_transports, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/branch.py", line 1035, in pull
result.tag_conflicts = self.update_tags(overwrite)
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/branch.py", line 997, in update_tags
return self.source.tags.merge_to(self.target.tags, overwrite)
File "/usr/lib/python2.6/dist-packages/bzrlib/tag.py", line 210, in merge_to
dest_dict = to_tags.get_tag_dict()
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/tags.py", line 290, in get_tag_dict
return _resolve_tags_svn_ancestry(self.branch, tag_revmetas)
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/tags.py", line 93, in _resolve_tags_svn_ancestry
pb=pb):
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/repository.py", line 780, in _iter_reverse_revmeta_mapping_ancestry
update_todo(todo, lhs_history)
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/repository.py", line 772, in update_todo
for entry in it:
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/util.py", line 142, in next
return self._next()
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/util.py", line 124, in _next
ret = self._iterator.next()
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/repository.py", line 807, in _iter_reverse_revmeta_mapping_history
for revmeta in iter:
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/util.py", line 165, in next
return self.it()
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/revmeta.py", line 983, in next
ret = self._get_next()
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/revmeta.py", line 1376, in convert
metabranch._revs[-1]._set_direct_lhs_parent_revmeta(ret)
File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/svn/revmeta.py", line 298, in _set_direct_lhs_parent_revmeta
raise AssertionError("Tried registering %r as parent while %r already was parent for %r" % (parent_revmeta, self._direct_lhs_parent_revmeta, self))
AssertionError: Tried registering <CachingRevisionMetadata for revision 174, path in repository 'a37b5e43-4b7f-4128-9b7a-df1949a3dd69'> as parent while <CachingRevisionMetadata for revision 165, path in repository 'a37b5e43-4b7f-4128-9b7a-df1949a3dd69'> already was parent for <CachingRevisionMetadata for revision 177, path trunk in repository 'a37b5e43-4b7f-4128-9b7a-df1949a3dd69'>
bzr 2.1.2 on python 2.6.6 (Linux-2.6.35.7-x86_64-with-debian-squeeze-sid)
arguments: ['/usr/bin/bzr', 'pull', '../chris/']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [2.1.0]
dbus /usr/lib/python2.6/dist-packages/bzrlib/plugins/dbus [0.1.0dev]
explorer /usr/lib/python2.6/dist-packages/bzrlib/plugins/explorer [1.0.0]
git /usr/lib/python2.6/dist-packages/bzrlib/plugins/git [0.5.2]
gtk /usr/lib/python2.6/dist-packages/bzrlib/plugins/gtk [0.99.0dev1]
hg /usr/lib/python2.6/dist-packages/bzrlib/plugins/hg [0.2.0dev]
launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [2.1.2]
netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [2.1.2]
news_merge /usr/lib/python2.6/dist-packages/bzrlib/plugins/news_merge [2.1.2]
qbzr /usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr [0.18.6]
svn /usr/lib/python2.6/dist-packages/bzrlib/plugins/svn [1.0.3]
It seems that the main problem is that the checkout is has the "append only" flag because it is a checkout of SVN. I finally succeeded to get the revision in with "bzr merge", "bzr qci" followed by
bzr: ERROR: Bound branch BzrBranch7(
and then "bzr update" and "bzr revert" but a suggestion for something simpler would be appreciated.