pull/merge error: parent id doesnt exist
David Clymer
david at zettazebra.com
Fri Jun 24 14:50:35 BST 2005
I keep a pristine local bzr.dev branch and update it occasionally with "bzr pull"
When updating from rev 658 to the current revision, I got the following error:
david at zepto:~/dev/community/bzr/bzr.dev$ bzr pull
Added 8 texts.
Added 6 inventories.
Added 6 revisions.
0 conflicts encountered.
bzr: error: parent_id {plugins-20050622090833-e6d6498bece7e1ae} not in inventory
at /home/david/dev/community/bzr/bzr.dc/bzrlib/errors.py:72 in bailout()
see ~/.bzr.log for debug information
Since I'm not really up on the whole merge algorithm, I don't know if this
is normal/expected behavior or a bug. Anyway, its just FYI.
-davidc
Version prior to pull:
david at zepto:~/dev/personal/python/lyntin/lyntin40/lyntin$ bzr --version
bzr (bazaar-ng) 0.0.5pre
(bzr checkout, revision 658 {mbp at sourcefrog.net-20050610084033-22955aa7533654f3})
Copyright 2005 Canonical Development Ltd.
http://bazaar-ng.org/
bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.
-------------- next part --------------
[24064] bzr 0.0.5pre invoked on python 2.3.5.final.0 (linux2)
[24064] arguments: ['/home/david/bin/bzr', 'pull']
[24064] working dir: /home/david/dev/community/bzr/bzr.dev
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/branch-format
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-history
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store/mbp@sourcefrog.net-20050622093359-e3f2b0800bb5eb7e.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store/mbp@sourcefrog.net-20050622093411-117a9269549f7c03.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store/mbp@sourcefrog.net-20050622093459-ae98697775f694ca.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store/mbp@sourcefrog.net-20050622093524-b15e2d374c2ae6ea.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store/mbp@sourcefrog.net-20050624043547-b021184c6d486647.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store/mbp@sourcefrog.net-20050624044814-1db5090ffeaa95d9.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050622093359-e3f2b0800bb5eb7e.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050622093411-117a9269549f7c03.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050622093459-ae98697775f694ca.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050622093524-b15e2d374c2ae6ea.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050624043547-b021184c6d486647.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050624044814-1db5090ffeaa95d9.gz
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/text-store//plugin.py-20050622093359-251849aaf185d606.gz
[24064] add store entry 'plugin.py-20050622093359-251849aaf185d606'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/text-store//commands.py-20050624044814-e59f4e29a1242dcf.gz
[24064] add store entry 'commands.py-20050624044814-e59f4e29a1242dcf'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/text-store//NEWS-20050624044814-180bead358c92c36.gz
[24064] add store entry 'NEWS-20050624044814-180bead358c92c36'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/text-store//__init__.py-20050622093411-899dbc8bcbcfe626.gz
[24064] add store entry '__init__.py-20050622093411-899dbc8bcbcfe626'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/text-store//__init__.py-20050622093459-2e96e08ca4a003d6.gz
[24064] add store entry '__init__.py-20050622093459-2e96e08ca4a003d6'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/text-store//remotebranch.py-20050624043547-4ed4dca0a11f836a.gz
[24064] add store entry 'remotebranch.py-20050624043547-4ed4dca0a11f836a'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/text-store//commands.py-20050622093411-73b71e5eef7a7930.gz
[24064] add store entry 'commands.py-20050622093411-73b71e5eef7a7930'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/text-store//osutils.py-20050624044814-d60c61ac0f671bcc.gz
[24064] add store entry 'osutils.py-20050624044814-d60c61ac0f671bcc'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050622093359-e3f2b0800bb5eb7e.gz
[24064] add store entry 'mbp at sourcefrog.net-20050622093359-e3f2b0800bb5eb7e'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050622093411-117a9269549f7c03.gz
[24064] add store entry 'mbp at sourcefrog.net-20050622093411-117a9269549f7c03'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050622093459-ae98697775f694ca.gz
[24064] add store entry 'mbp at sourcefrog.net-20050622093459-ae98697775f694ca'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050622093524-b15e2d374c2ae6ea.gz
[24064] add store entry 'mbp at sourcefrog.net-20050622093524-b15e2d374c2ae6ea'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050624043547-b021184c6d486647.gz
[24064] add store entry 'mbp at sourcefrog.net-20050624043547-b021184c6d486647'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/inventory-store//mbp@sourcefrog.net-20050624044814-1db5090ffeaa95d9.gz
[24064] add store entry 'mbp at sourcefrog.net-20050624044814-1db5090ffeaa95d9'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store//mbp@sourcefrog.net-20050622093359-e3f2b0800bb5eb7e.gz
[24064] add store entry 'mbp at sourcefrog.net-20050622093359-e3f2b0800bb5eb7e'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store//mbp@sourcefrog.net-20050622093411-117a9269549f7c03.gz
[24064] add store entry 'mbp at sourcefrog.net-20050622093411-117a9269549f7c03'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store//mbp@sourcefrog.net-20050622093459-ae98697775f694ca.gz
[24064] add store entry 'mbp at sourcefrog.net-20050622093459-ae98697775f694ca'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store//mbp@sourcefrog.net-20050622093524-b15e2d374c2ae6ea.gz
[24064] add store entry 'mbp at sourcefrog.net-20050622093524-b15e2d374c2ae6ea'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store//mbp@sourcefrog.net-20050624043547-b021184c6d486647.gz
[24064] add store entry 'mbp at sourcefrog.net-20050624043547-b021184c6d486647'
[24064] grab url http://www.bazaar-ng.org/bzr/bzr.dev/.bzr/revision-store//mbp@sourcefrog.net-20050624044814-1db5090ffeaa95d9.gz
[24064] add store entry 'mbp at sourcefrog.net-20050624044814-1db5090ffeaa95d9'
[24064] add {mbp at sourcefrog.net-20050622093359-e3f2b0800bb5eb7e} to revision-history
[24064] add {mbp at sourcefrog.net-20050622093411-117a9269549f7c03} to revision-history
[24064] add {mbp at sourcefrog.net-20050622093459-ae98697775f694ca} to revision-history
[24064] add {mbp at sourcefrog.net-20050622093524-b15e2d374c2ae6ea} to revision-history
[24064] add {mbp at sourcefrog.net-20050624043547-b021184c6d486647} to revision-history
[24064] add {mbp at sourcefrog.net-20050624044814-1db5090ffeaa95d9} to revision-history
[24064] lookup path ['build-api']
[24064] lookup path ['doc', 'cherry-picking.txt']
[24064] lookup path ['bzrlib', 'textinv.py']
[24064] lookup path ['plugins']
[24064] lookup path ['patches', 'plugins-no-plugins.patch']
[24064] lookup path ['doc', 'extra-commands.txt']
[24064] lookup path ['bzrlib', 'store.py']
[24064] lookup path ['plugins', 'changeset']
[24064] lookup path ['doc', 'layers.txt']
[24064] lookup path ['doc', 'join-branches.txt']
[24064] lookup path ['patches', 'annotate4.patch']
[24064] lookup path ['doc', 'deadly-sins.txt']
[24064] lookup path ['urlgrabber']
[24064] lookup path ['doc', 'costs.txt']
[24064] lookup path ['bzrlib', 'statcache.py']
[24064] lookup path ['doc', 'hashes.txt']
[24064] lookup path ['notes', 'performance.txt']
[24064] lookup path ['urlgrabber', 'byterange.py']
[24064] lookup path ['doc', 'formats.txt']
[24064] lookup path ['bzrlib', 'log.py']
[24064] lookup path ['bzrlib', 'remotebranch.py']
[24064] lookup path ['doc', 'design.txt']
[24064] lookup path ['doc', 'Makefile']
[24064] lookup path ['doc', 'use-cases.txt']
[24064] lookup path ['doc', 'security.txt']
[24064] lookup path ['plugins', 'changeset', '__init__.py']
[24064] lookup path ['doc', 'intro.txt']
[24064] lookup path ['bzrlib', 'selftest', 'whitebox.py']
[24064] lookup path ['doc', 'random.txt']
[24064] lookup path ['bzrlib', 'diff.py']
[24064] lookup path ['plugins', 'changeset', 'apply_changeset.py']
[24064] lookup path ['bzrlib', 'revfile.py']
[24064] lookup path ['doc', 'compared-aegis.txt']
[24064] lookup path ['doc']
[24064] lookup path ['bzrlib', 'lock.py']
[24064] lookup path ['doc', 'todo-from-arch.txt']
[24064] lookup path ['bzrlib', 'selftest']
[24064] lookup path ['bzrlib', 'plugin.py']
[24064] lookup path ['doc', 'taxonomy.txt']
[24064] lookup path ['elementtree', '__init__.py']
[24064] lookup path ['doc', 'pool.txt']
[24064] lookup path ['contrib', 'bash', 'bzr']
[24064] lookup path ['doc', 'revfile-annotation.txt']
[24064] lookup path ['setup.py']
[24064] lookup path ['patches', 'meta-data-in-inventory.patch']
[24064] lookup path ['bzrlib', 'selftest', '__init__.py']
[24064] lookup path ['doc', 'switch-in-branch.txt']
[24064] lookup path ['.bzrignore']
[24064] lookup path ['bzrlib', 'selftest', 'versioning.py']
[24064] lookup path ['bzrlib', 'tree.py']
[24064] lookup path ['doc', 'unrelated-merge.txt']
[24064] lookup path ['plugins', 'changeset', 'common.py']
[24064] lookup path ['doc', 'yaml.txt']
[24064] lookup path ['doc', 'python.txt']
[24064] lookup path ['bzrlib', 'info.py']
[24064] lookup path ['doc', 'interrupted.txt']
[24064] lookup path ['doc', 'compression.txt']
[24064] lookup path ['doc', 'index.txt']
[24064] lookup path ['contrib', 'zsh']
[24064] lookup path ['doc', 'compared-codeville.txt']
[24064] lookup path ['doc', 'kill-version.txt']
[24064] lookup path ['doc', 'thanks.txt']
[24064] lookup path ['doc', 'news.txt']
[24064] lookup path ['doc', 'merge.txt']
[24064] lookup path ['bzrlib', 'textui.py']
[24064] lookup path ['doc', 'requirements.txt']
[24064] lookup path ['doc', 'ignore.txt']
[24064] lookup path ['notes']
[24064] lookup path ['bzrlib', 'selftest', 'plugins.py']
[24064] lookup path ['contrib', 'zsh', '_bzr']
[24064] lookup path ['doc', 'monotone.txt']
[24064] lookup path ['bzrlib', 'commit.py']
[24064] lookup path ['bzrlib', 'add.py']
[24064] lookup path ['doc', 'usability.txt']
[24064] lookup path ['NEWS']
[24064] lookup path ['doc', 'unchanged.txt']
[24064] lookup path ['bzrlib', 'newinventory.py']
[24064] lookup path ['contrib', 'pwclient.full']
[24064] lookup path ['patches', 'progress.diff']
[24064] lookup path ['bzrlib', 'help.py']
[24064] lookup path ['doc', 'web-interface.txt']
[24064] lookup path ['bzrlib', 'inventory.py']
[24064] lookup path ['contrib']
[24064] lookup path ['notes', 'new-inventory-sample.xml']
[24064] lookup path ['doc', 'library-interface.txt']
[24064] lookup path ['bzrlib', 'merge_core.py']
[24064] lookup path ['doc', 'quotes.txt']
[24064] lookup path ['doc', 'optional-edit.txt']
[24064] lookup path ['doc', 'scalability.txt']
[24064] lookup path ['doc', 'bitkeeper.txt']
[24064] lookup path ['doc', 'common-format.txt']
[24064] lookup path ['contrib', 'fortune']
[24064] lookup path ['doc', 'mirroring.txt']
[24064] lookup path ['doc', 'rollup.txt']
[24064] lookup path ['patches', 'annotate3.patch']
[24064] lookup path ['bzrlib', 'trace.py']
[24064] lookup path ['bzrlib', 'mdiff.py']
[24064] lookup path ['urlgrabber', 'keepalive.py']
[24064] lookup path ['doc', 'compared-prcs.txt']
[24064] lookup path ['bzrlib', 'branch.py']
[24064] lookup path ['contrib', 'bash', 'bzr.simple']
[24064] lookup path ['doc', 'supportability.txt']
[24064] lookup path ['testbzr']
[24064] lookup path ['urlgrabber', 'grabber.py']
[24064] lookup path ['bzrlib', 'revision.py']
[24064] lookup path ['elementtree']
[24064] lookup path ['bzrlib', '__init__.py']
[24064] lookup path ['doc', 'compared-opencm.txt']
[24064] lookup path ['doc', 'workflow.txt']
[24064] lookup path ['doc', 'cmdref.txt']
[24064] lookup path ['bzrlib', 'workingtree.py']
[24064] lookup path ['bzrlib', 'status.py']
[24064] lookup path ['bzrlib', 'upgrade.py']
[24064] lookup path ['bzrlib', 'patch.py']
[24064] lookup path ['README']
[24064] lookup path ['doc', 'partial-commit.txt']
[24064] lookup path ['doc', 'revfile.txt']
[24064] lookup path ['.rsyncexclude']
[24064] lookup path ['bzrlib', 'progress.py']
[24064] lookup path ['urlgrabber', '__init__.py']
[24064] lookup path ['bzrlib', 'atomicfile.py']
[24064] lookup path ['bzrlib', 'changeset.py']
[24064] lookup path ['TODO']
[24064] lookup path ['doc', 'shared-branches.txt']
[24064] lookup path ['patches']
[24064] lookup path ['doc', 'quilt.txt']
[24064] lookup path ['elementtree', 'ElementTree.py']
[24064] lookup path ['bzrlib', 'xml.py']
[24064] lookup path ['contrib', 'bash']
[24064] lookup path ['doc', 'changelogs.txt']
[24064] lookup path ['doc', 'tagging.txt']
[24064] lookup path ['bzrlib']
[24064] lookup path ['bzrlib', 'merge.py']
[24064] lookup path ['bzrlib', 'commands.py']
[24064] lookup path ['bzrlib', 'errors.py']
[24064] lookup path ['contrib', 'pwk']
[24064] lookup path ['doc', 'inventory.txt']
[24064] lookup path ['doc', 'adoption.txt']
[24064] lookup path ['bzrlib', 'osutils.py']
[24064] lookup path ['patches', 'symlink-support.patch']
[24064] lookup path ['urlgrabber', 'progress.py']
[24064] lookup path ['bzrlib', 'selftest', 'blackbox.py']
[24064] lookup path ['contrib', 'upload-bzr.dev']
[24064] lookup path ['bzr']
[24064] lookup path ['plugins', 'changeset', 'gen_changeset.py']
[24064] lookup path ['bzr-man.py']
[24064] lookup path ['doc', 'revision-syntax.txt']
[24064] lookup path ['urlgrabber', 'mirror.py']
[24064] lookup path ['doc', 'short-demo.txt']
[24064] lookup path ['doc', 'compared-teamware.txt']
[24064] lookup path ['doc', 'purpose.txt']
[24064] lookup path ['doc', 'config-specs.txt']
[24064] lookup path ['patches', 'find-touching-from-seq.diff']
[24064] lookup path ['contrib', 'add-bzr-to-baz']
[24064] lookup path ['doc', 'svk.txt']
[24064] lookup path ['plugins', 'changeset', 'read_changeset.py']
[24064] lookup path ['doc', 'default.css']
[24064] lookup path ['doc', 'darcs.txt']
[24064] lookup path ['doc', 'conflicts.txt']
[24064] lookup path ['bzrlib', 'check.py']
[24064] lookup path ['contrib', 'create_bzr_rollup.py']
[24064] lookup path ['patches', 'cache-remote-revisions.diff']
[24064] lookup path ['doc', 'compared-cvsnt.txt']
[24064] lookup path []
[24064] lookup path ['build-api']
[24064] lookup path ['doc', 'cherry-picking.txt']
[24064] lookup path ['bzrlib', 'textinv.py']
[24064] lookup path ['contrib', 'plugins']
[24064] lookup path ['patches', 'plugins-no-plugins.patch']
[24064] lookup path ['doc', 'extra-commands.txt']
[24064] lookup path ['bzrlib', 'store.py']
[24064] lookup path ['contrib', 'plugins', 'changeset']
[24064] lookup path ['doc', 'layers.txt']
[24064] lookup path ['doc', 'join-branches.txt']
[24064] lookup path ['patches', 'annotate4.patch']
[24064] lookup path ['doc', 'deadly-sins.txt']
[24064] lookup path ['urlgrabber']
[24064] lookup path ['doc', 'costs.txt']
[24064] lookup path ['bzrlib', 'statcache.py']
[24064] lookup path ['doc', 'hashes.txt']
[24064] lookup path ['notes', 'performance.txt']
[24064] lookup path ['urlgrabber', 'byterange.py']
[24064] lookup path ['doc', 'formats.txt']
[24064] lookup path ['bzrlib', 'log.py']
[24064] lookup path ['bzrlib', 'remotebranch.py']
[24064] lookup path ['bzrlib', 'xml.py']
[24064] lookup path ['doc', 'Makefile']
[24064] lookup path ['doc', 'use-cases.txt']
[24064] lookup path ['doc', 'security.txt']
[24064] lookup path ['contrib', 'plugins', 'changeset', '__init__.py']
[24064] lookup path ['doc', 'intro.txt']
[24064] lookup path ['bzrlib', 'selftest', 'whitebox.py']
[24064] lookup path ['doc', 'random.txt']
[24064] lookup path ['bzrlib', 'diff.py']
[24064] lookup path ['bzrlib', 'revfile.py']
[24064] lookup path ['doc', 'compared-aegis.txt']
[24064] lookup path ['doc']
[24064] lookup path ['bzrlib', 'lock.py']
[24064] lookup path ['doc', 'todo-from-arch.txt']
[24064] lookup path ['bzrlib', 'selftest']
[24064] lookup path ['bzrlib', 'plugin.py']
[24064] lookup path ['doc', 'taxonomy.txt']
[24064] lookup path ['elementtree', '__init__.py']
[24064] lookup path ['doc', 'pool.txt']
[24064] lookup path ['contrib', 'bash', 'bzr']
[24064] lookup path ['doc', 'revfile-annotation.txt']
[24064] lookup path ['setup.py']
[24064] lookup path ['patches', 'meta-data-in-inventory.patch']
[24064] lookup path ['bzrlib', 'selftest', '__init__.py']
[24064] lookup path ['doc', 'switch-in-branch.txt']
[24064] lookup path ['.bzrignore']
[24064] lookup path ['bzrlib', 'selftest', 'versioning.py']
[24064] lookup path ['bzrlib', 'tree.py']
[24064] lookup path ['doc', 'ignore.txt']
[24064] lookup path ['contrib', 'plugins', 'changeset', 'common.py']
[24064] lookup path ['doc', 'yaml.txt']
[24064] lookup path ['doc', 'python.txt']
[24064] lookup path ['bzrlib', 'info.py']
[24064] lookup path ['doc', 'interrupted.txt']
[24064] lookup path ['doc', 'compression.txt']
[24064] lookup path ['doc', 'index.txt']
[24064] lookup path ['contrib', 'zsh']
[24064] lookup path ['doc', 'compared-codeville.txt']
[24064] lookup path ['doc', 'kill-version.txt']
[24064] lookup path ['doc', 'thanks.txt']
[24064] lookup path ['doc', 'news.txt']
[24064] lookup path ['doc', 'merge.txt']
[24064] lookup path ['bzrlib', 'textui.py']
[24064] lookup path ['doc', 'requirements.txt']
[24064] lookup path ['contrib', 'plugins', 'changeset', 'apply_changeset.py']
[24064] lookup path ['notes']
[24064] lookup path ['bzrlib', 'selftest', 'plugins.py']
[24064] lookup path ['contrib', 'zsh', '_bzr']
[24064] lookup path ['doc', 'monotone.txt']
[24064] lookup path ['bzrlib', 'commit.py']
[24064] lookup path ['bzrlib', 'add.py']
[24064] lookup path ['doc', 'usability.txt']
[24064] lookup path ['NEWS']
[24064] lookup path ['doc', 'unchanged.txt']
[24064] lookup path ['bzrlib', 'newinventory.py']
[24064] lookup path ['contrib', 'pwclient.full']
[24064] lookup path ['patches', 'progress.diff']
[24064] lookup path ['bzrlib', 'help.py']
[24064] lookup path ['doc', 'web-interface.txt']
[24064] lookup path ['bzrlib', 'inventory.py']
[24064] lookup path ['contrib']
[24064] lookup path ['notes', 'new-inventory-sample.xml']
[24064] lookup path ['doc', 'default.css']
[24064] lookup path ['doc', 'library-interface.txt']
[24064] lookup path ['bzrlib', 'merge_core.py']
[24064] lookup path ['doc', 'quotes.txt']
[24064] lookup path ['doc', 'optional-edit.txt']
[24064] lookup path ['doc', 'scalability.txt']
[24064] lookup path ['doc', 'bitkeeper.txt']
[24064] lookup path ['doc', 'common-format.txt']
[24064] lookup path ['contrib', 'fortune']
[24064] lookup path ['doc', 'mirroring.txt']
[24064] lookup path ['doc', 'rollup.txt']
[24064] lookup path ['patches', 'annotate3.patch']
[24064] lookup path ['bzrlib', 'trace.py']
[24064] lookup path ['bzrlib', 'mdiff.py']
[24064] lookup path ['urlgrabber', 'keepalive.py']
[24064] lookup path ['doc', 'compared-prcs.txt']
[24064] lookup path ['bzrlib', 'branch.py']
[24064] lookup path ['contrib', 'bash', 'bzr.simple']
[24064] lookup path ['doc', 'supportability.txt']
[24064] lookup path ['testbzr']
[24064] lookup path ['urlgrabber', 'grabber.py']
[24064] lookup path ['bzrlib', 'revision.py']
[24064] lookup path ['elementtree']
[24064] lookup path ['bzrlib', '__init__.py']
[24064] lookup path ['doc', 'compared-opencm.txt']
[24064] lookup path ['doc', 'workflow.txt']
[24064] lookup path ['doc', 'cmdref.txt']
[24064] lookup path ['bzrlib', 'workingtree.py']
[24064] lookup path ['bzrlib', 'status.py']
[24064] lookup path ['bzrlib', 'upgrade.py']
[24064] lookup path ['bzrlib', 'patch.py']
[24064] lookup path ['README']
[24064] lookup path ['doc', 'partial-commit.txt']
[24064] lookup path ['doc', 'revfile.txt']
[24064] lookup path ['.rsyncexclude']
[24064] lookup path ['bzrlib', 'progress.py']
[24064] lookup path ['urlgrabber', '__init__.py']
[24064] lookup path ['bzrlib', 'atomicfile.py']
[24064] lookup path ['bzrlib', 'changeset.py']
[24064] lookup path ['doc', 'shared-branches.txt']
[24064] lookup path ['patches']
[24064] lookup path ['doc', 'quilt.txt']
[24064] lookup path ['elementtree', 'ElementTree.py']
[24064] lookup path ['doc', 'design.txt']
[24064] lookup path ['contrib', 'bash']
[24064] lookup path ['doc', 'changelogs.txt']
[24064] lookup path ['doc', 'tagging.txt']
[24064] lookup path ['bzrlib']
[24064] lookup path ['bzrlib', 'merge.py']
[24064] lookup path ['bzrlib', 'commands.py']
[24064] lookup path ['bzrlib', 'errors.py']
[24064] lookup path ['contrib', 'pwk']
[24064] lookup path ['doc', 'inventory.txt']
[24064] lookup path ['doc', 'adoption.txt']
[24064] lookup path ['bzrlib', 'osutils.py']
[24064] lookup path ['patches', 'symlink-support.patch']
[24064] lookup path ['urlgrabber', 'progress.py']
[24064] lookup path ['doc', 'unrelated-merge.txt']
[24064] lookup path ['bzrlib', 'selftest', 'blackbox.py']
[24064] lookup path ['contrib', 'upload-bzr.dev']
[24064] lookup path ['bzr']
[24064] lookup path ['contrib', 'plugins', 'changeset', 'gen_changeset.py']
[24064] lookup path ['bzr-man.py']
[24064] lookup path ['doc', 'revision-syntax.txt']
[24064] lookup path ['urlgrabber', 'mirror.py']
[24064] lookup path ['doc', 'short-demo.txt']
[24064] lookup path ['doc', 'compared-teamware.txt']
[24064] lookup path ['doc', 'purpose.txt']
[24064] lookup path ['doc', 'config-specs.txt']
[24064] lookup path ['patches', 'find-touching-from-seq.diff']
[24064] lookup path ['contrib', 'add-bzr-to-baz']
[24064] lookup path ['doc', 'svk.txt']
[24064] lookup path ['contrib', 'plugins', 'changeset', 'read_changeset.py']
[24064] lookup path ['TODO']
[24064] lookup path ['doc', 'darcs.txt']
[24064] lookup path ['doc', 'conflicts.txt']
[24064] lookup path ['bzrlib', 'check.py']
[24064] lookup path ['contrib', 'create_bzr_rollup.py']
[24064] lookup path ['patches', 'cache-remote-revisions.diff']
[24064] lookup path ['doc', 'compared-cvsnt.txt']
[24064] lookup path []
[24064] loaded inventory of 164 items in 0.003609
[24064] statcache: statted 151 files, read 0 files, 0 changed, 0 dangerous, 0 deleted, 0 new, 151 in cache
[24064] get fileid{__init__.py-20050622090833-aaa07fa64abea70c} from <bzrlib.tree.RevisionTree object at 0x2a97895550>
[24064] get fileid{__init__.py-20050622090833-aaa07fa64abea70c} from <bzrlib.tree.RevisionTree object at 0x2a9786bed0>
[24064] get fileid{remotebranch.py-20050407040217-1eead7ac32de9b4ce8211f5c} from <bzrlib.tree.RevisionTree object at 0x2a97895550>
[24064] get fileid{remotebranch.py-20050407040217-1eead7ac32de9b4ce8211f5c} from <bzrlib.tree.RevisionTree object at 0x2a9786bed0>
[24064] get fileid{NEWS-20050323055033-4e00b5db738777ff} from <bzrlib.tree.RevisionTree object at 0x2a97895550>
[24064] get fileid{NEWS-20050323055033-4e00b5db738777ff} from <bzrlib.tree.RevisionTree object at 0x2a9786bed0>
[24064] get fileid{osutils.py-20050309040759-eeaff12fbf77ac86} from <bzrlib.tree.RevisionTree object at 0x2a97895550>
[24064] get fileid{osutils.py-20050309040759-eeaff12fbf77ac86} from <bzrlib.tree.RevisionTree object at 0x2a9786bed0>
[24064] get fileid{plugin.py-20050622060424-829b654519533d69} from <bzrlib.tree.RevisionTree object at 0x2a97895550>
[24064] get fileid{plugin.py-20050622060424-829b654519533d69} from <bzrlib.tree.RevisionTree object at 0x2a9786bed0>
[24064] get fileid{bzr.py-20050309040720-d10f4714595cf8c3} from <bzrlib.tree.RevisionTree object at 0x2a97895550>
[24064] get fileid{bzr.py-20050309040720-d10f4714595cf8c3} from <bzrlib.tree.RevisionTree object at 0x2a9786bed0>
[24064] loaded inventory of 164 items in 0.003659
[24064] Inventory regeneration:
[24064] bzr: error: parent_id {plugins-20050622090833-e6d6498bece7e1ae} not in inventory
[24064] BzrError
[24064] Python 2.3.5: /usr/bin/python
[24064] Fri Jun 24 08:54:53 2005
[24064]
[24064] A problem occurred in a Python script. Here is the sequence of
[24064] function calls leading up to the error, in the order they occurred.
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/commands.py in main(argv=['/home/david/bin/bzr', 'pull'])
[24064] 1501 try:
[24064] 1502 try:
[24064] 1503 return run_bzr(argv)
[24064] 1504 finally:
[24064] 1505 # do this here inside the exception wrappers to catch EPIPE
[24064] global run_bzr = <function run_bzr>
[24064] argv = ['/home/david/bin/bzr', 'pull']
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/commands.py in run_bzr(argv=[u'/home/david/bin/bzr', u'pull'])
[24064] 1476 os.remove(pfname)
[24064] 1477 else:
[24064] 1478 return cmd_class(cmdopts, cmdargs).status
[24064] 1479
[24064] 1480
[24064] cmd_class = <class 'bzrlib.commands.cmd_pull'>
[24064] cmdopts = {}
[24064] cmdargs = {}
[24064] ).status undefined
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/commands.py in __init__(self=<bzrlib.commands.cmd_pull object>, options={}, arguments={})
[24064] 214 assert self.__doc__ != Command.__doc__, \
[24064] 215 ("No help message set for %r" % self)
[24064] 216 self.status = self.run(**cmdargs)
[24064] 217
[24064] 218
[24064] self = <bzrlib.commands.cmd_pull object>
[24064] self.status undefined
[24064] self.run = <bound method cmd_pull.run of <bzrlib.commands.cmd_pull object>>
[24064] cmdargs = {}
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/commands.py in run(self=<bzrlib.commands.cmd_pull object>, location='http://www.bazaar-ng.org/bzr/bzr.dev')
[24064] 509 raise BzrCommandError("These branches have diverged. Try merge.")
[24064] 510
[24064] 511 merge(('.', -1), ('.', old_revno), check_clean=False)
[24064] 512 if location != stored_loc:
[24064] 513 br_to.controlfile("x-pull", "wb").write(location + "\n")
[24064] merge = <function merge>
[24064] old_revno = 757
[24064] check_clean undefined
[24064] builtinFalse = False
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/merge.py in merge(other_revision=('.', -1), base_revision=('.', 757), check_clean=False, ignore_zero=False, this_dir='.')
[24064] 196 base_branch, base_tree = get_tree(base_revision, tempdir, "base")
[24064] 197 merge_inner(this_branch, other_tree, base_tree, tempdir,
[24064] 198 ignore_zero=ignore_zero)
[24064] 199 finally:
[24064] 200 shutil.rmtree(tempdir)
[24064] ignore_zero = False
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/merge.py in merge_inner(this_branch=Branch('/home/david/dev/community/bzr/bzr.dev'), other_tree=<bzrlib.merge.MergeTree object>, base_tree=<bzrlib.merge.MergeTree object>, tempdir='/tmp/bzr-XzQLif', ignore_zero=False)
[24064] 246 path = path[2:]
[24064] 247 adjust_ids.append((path, id))
[24064] 248 this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
[24064] 249
[24064] 250
[24064] this_branch = Branch('/home/david/dev/community/bzr/bzr.dev')
[24064] this_branch.set_inventory = <bound method Branch.set_inventory of Branch('/home/david/dev/community/bzr/bzr.dev')>
[24064] global regen_inventory = <function regen_inventory>
[24064] this_tree = <bzrlib.merge.MergeTree object>
[24064] this_tree.root = '/home/david/dev/community/bzr/bzr.dev'
[24064] adjust_ids = [('plugins', 'plugins-20050622090833-e6d6498bece7e1ae')]
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/branch.py in set_inventory(self=Branch('/home/david/dev/community/bzr/bzr.dev'), new_inventory_list=[('', 'TREE_ROOT', None, 'root_directory'), ('.bzrignore', 'bzrignore-20050311232317-81f7b71efa2db11a', 'TREE_ROOT', 'file'), ('.rsyncexclude', 'rsyncexclude-20050408053852-27e0a5928b6829f645beb2e6', 'TREE_ROOT', 'file'), ('NEWS', 'NEWS-20050323055033-4e00b5db738777ff', 'TREE_ROOT', 'file'), ('README', 'README-20050309040720-8f368abf9f346b9d', 'TREE_ROOT', 'file'), ('TODO', 'TODO-20050426050852-44d2ad9048dafbe9', 'TREE_ROOT', 'file'), ('build-api', 'build-api-20050309064830-a0be0dc1452cda87', 'TREE_ROOT', 'file'), ('bzr', 'bzr.py-20050313053754-5485f144c7006fa6', 'TREE_ROOT', 'file'), ('bzr-man.py', 'bzrman.py-20050601153041-0ff7f74de456d15e', 'TREE_ROOT', 'file'), ('bzrlib', 'bzrlib-20050309040749-4ac9a0e211602846', 'TREE_ROOT', 'directory'), ('bzrlib/__init__.py', '__init__.py-20050309040759-33e65acf91bbcd5d', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/add.py', 'add.py-20050323030017-3a77d63feda58e33', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/atomicfile.py', 'atomicfile.py-20050509044450-dbd24e6c564f7c66', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/branch.py', 'branch.py-20050309040759-e4baf4e0d046576e', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/changeset.py', 'changeset.py-20050513021216-b02ab57fb9738913', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/check.py', 'check.py-20050309040759-f3a679400c06bcc1', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/commands.py', 'bzr.py-20050309040720-d10f4714595cf8c3', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/commit.py', 'commit.py-20050511101309-79ec1a0168e0e825', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/diff.py', 'diff.py-20050309040759-26944fbbf2ebbf36', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ('bzrlib/errors.py', 'errors.py-20050309040759-20512168c4e14fbd', 'bzrlib-20050309040749-4ac9a0e211602846', 'file'), ...])
[24064] 489 if name == "":
[24064] 490 continue
[24064] 491 inv.add(InventoryEntry(file_id, name, kind, parent))
[24064] 492 self._write_inventory(inv)
[24064] 493
[24064] inv = <bzrlib.inventory.Inventory instance>
[24064] inv.add = <bound method Inventory.add of <bzrlib.inventory.Inventory instance>>
[24064] global InventoryEntry = <class bzrlib.inventory.InventoryEntry>
[24064] file_id = 'changeset-20050622090833-4173d7d0dcc5dde3'
[24064] name = 'changeset'
[24064] kind = 'directory'
[24064] parent = 'plugins-20050622090833-e6d6498bece7e1ae'
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/inventory.py in add(self=<bzrlib.inventory.Inventory instance>, entry=InventoryEntry('changeset-20050622090833-4173d7d...ent_id='plugins-20050622090833-e6d6498bece7e1ae'))
[24064] 417 parent = self._byid[entry.parent_id]
[24064] 418 except KeyError:
[24064] 419 bailout("parent_id {%s} not in inventory" % entry.parent_id)
[24064] 420
[24064] 421 if parent.children.has_key(entry.name):
[24064] global bailout = <function bailout>
[24064] entry = InventoryEntry('changeset-20050622090833-4173d7d...ent_id='plugins-20050622090833-e6d6498bece7e1ae')
[24064] entry.parent_id = 'plugins-20050622090833-e6d6498bece7e1ae'
[24064]
[24064] /home/david/dev/community/bzr/bzr.dc/bzrlib/errors.py in bailout(msg='parent_id {plugins-20050622090833-e6d6498bece7e1ae} not in inventory', explanation=[])
[24064] 69 ex = BzrError(msg, explanation)
[24064] 70 import trace
[24064] 71 trace._tracefile.write('* raising %s\n' % ex)
[24064] 72 raise ex
[24064] 73
[24064] ex = <bzrlib.errors.BzrError instance>
[24064] BzrError: ('parent_id {plugins-20050622090833-e6d6498bece7e1ae} not in inventory', [])
[24064] __doc__ = None
[24064] __getitem__ = <bound method BzrError.__getitem__ of <bzrlib.errors.BzrError instance>>
[24064] __init__ = <bound method BzrError.__init__ of <bzrlib.errors.BzrError instance>>
[24064] __module__ = 'bzrlib.errors'
[24064] __str__ = <bound method BzrError.__str__ of <bzrlib.errors.BzrError instance>>
[24064] args = ('parent_id {plugins-20050622090833-e6d6498bece7e1ae} not in inventory', [])
[24064]
[24064] The above is a description of an error in a Python program. Here is
[24064] the original traceback:
[24064]
[24064] Traceback (most recent call last):
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/commands.py", line 1503, in main
[24064] return run_bzr(argv)
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/commands.py", line 1478, in run_bzr
[24064] return cmd_class(cmdopts, cmdargs).status
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/commands.py", line 216, in __init__
[24064] self.status = self.run(**cmdargs)
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/commands.py", line 511, in run
[24064] merge(('.', -1), ('.', old_revno), check_clean=False)
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/merge.py", line 198, in merge
[24064] ignore_zero=ignore_zero)
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/merge.py", line 248, in merge_inner
[24064] this_branch.set_inventory(regen_inventory(this_branch, this_tree.root, adjust_ids))
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/branch.py", line 491, in set_inventory
[24064] inv.add(InventoryEntry(file_id, name, kind, parent))
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/inventory.py", line 419, in add
[24064] bailout("parent_id {%s} not in inventory" % entry.parent_id)
[24064] File "/home/david/dev/community/bzr/bzr.dc/bzrlib/errors.py", line 72, in bailout
[24064] raise ex
[24064] BzrError: ('parent_id {plugins-20050622090833-e6d6498bece7e1ae} not in inventory', [])
[24064]
[24064]
[24064] finished, 0.370u/0.060s cpu, 0.080u/0.020s cum, 7.720 elapsed
More information about the bazaar
mailing list