mnemosyne-proj/mnemosyne $ bzr merge Merging from remembered parent location http://bazaar.launchpad.net/~peter-bienstman/mnemosyne-proj/trunk/ bzr: ERROR: bzrlib.errors.BzrCheckError: Internal check failed: Newly created pack file has delta references to items not in its repository: {'texts': [('2@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2FTODO', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('315@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Fpyqt_ui%2Fmnemosyne', 'peter.bienstman@ugent.be-20080921170051-wchgwdviy9zzy4eu'), ('325@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Fcard_type.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('452@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Fdatabase.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('452@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Fdatabases%2Fpickle.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('469@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Fui_controllers_main%2Fdefault_main_controller.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('493@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Ffact_view.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('cloze.py-20081005144809-30df6wo2zmv3qwwq-1', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa')]} Traceback (most recent call last): File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 893, in run_bzr_catch_errors return run_bzr(argv) File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 839, in run_bzr ret = run(*run_argv) File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 539, in run_argv_aliases return self.run(**all_cmd_args) File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3049, in run location, revision, remember, possible_transports, pb) File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3156, in _get_merger_from_branch other_revision_id, base_revision_id, other_branch, base_branch) File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 202, in from_revision_ids merger.set_other_revision(other, other_branch) File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 343, in set_other_revision self._maybe_fetch(other_branch, self.this_branch, self.other_rev_id) File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 360, in _maybe_fetch target.fetch(source, revision_id) 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 286, in fetch pb=nested_pb) File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1021, in fetch find_ghosts=find_ghosts) 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/repository.py", line 2880, in fetch return self._pack(self.source, self.target, revision_ids) File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 2887, in _pack revision_ids).pack() File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/pack_repo.py", line 647, in pack return self._create_pack_from_packs() File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/pack_repo.py", line 817, in _create_pack_from_packs new_pack._check_references() File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/pack_repo.py", line 346, in _check_references % (self, pformat(missing_items))) BzrCheckError: Internal check failed: Newly created pack file has delta references to items not in its repository: {'texts': [('2@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2FTODO', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('315@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Fpyqt_ui%2Fmnemosyne', 'peter.bienstman@ugent.be-20080921170051-wchgwdviy9zzy4eu'), ('325@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Fcard_type.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('452@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Fdatabase.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('452@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Fdatabases%2Fpickle.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('469@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Fui_controllers_main%2Fdefault_main_controller.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('493@e5e6b78b-db40-0410-9517-b98c64f8d2c1:trunk:mnemosyne%2Fmnemosyne%2Flibmnemosyne%2Ffact_view.py', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa'), ('cloze.py-20081005144809-30df6wo2zmv3qwwq-1', 'peter.bienstman@ugent.be-20081005160316-ggw83n8kh6a5caoa')]} bzr 1.10 on python 2.5.1 (linux2) arguments: ['/usr/bin/bzr', 'merge', '--force'] encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8' plugins: bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.9.1] gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.95.0.final.1] launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown] *** 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.