this is a debug log for diagnosing/reporting problems in bzr you can delete or truncate this file, or include sections in bug reports to https://bugs.launchpad.net/bzr/+filebug 0.172 encoding stdout as sys.stdout encoding 'cp437' 0.187 bzr arguments: [u'merge'] 0.187 looking for plugins in C:/Documents and Settings/Craig Hewetson/Application Data/bazaar/2.0/plugins 0.187 looking for plugins in C:\Python25\lib\site-packages\bzrlib\plugins 0.187 Plugin name __init__ already loaded 0.187 Plugin name __init__ already loaded 0.437 opening working tree 'Z:/NGMC/V4/src-plumbing' 0.469 file:///Z:/NGMC/V4/src/ [ 3288] 2008-04-15 15:27:23.750 INFO: Merging from remembered location Z:/NGMC/V4/src/ 0.500 Using fetch logic to copy between KnitPackRepository('file:///Z:/NGMC/V4/src/.bzr/repository/')() and KnitPackRepository('file:///Z:/NGMC/V4/src-plumbing/.bzr/repository/')() 3.000 Traceback (most recent call last): File "C:\Python25\Lib\site-packages\bzrlib\commands.py", line 834, in run_bzr_catch_errors return run_bzr(argv) File "C:\Python25\Lib\site-packages\bzrlib\commands.py", line 790, in run_bzr ret = run(*run_argv) File "C:\Python25\Lib\site-packages\bzrlib\commands.py", line 492, in run_argv_aliases return self.run(**all_cmd_args) File "C:\Python25\Lib\site-packages\bzrlib\builtins.py", line 2895, in run verified) File "C:\Python25\Lib\site-packages\bzrlib\builtins.py", line 2913, in _do_merge conflict_count = merger.do_merge() File "C:\Python25\Lib\site-packages\bzrlib\merge.py", line 421, in do_merge merge.do_merge() File "C:\Python25\Lib\site-packages\bzrlib\merge.py", line 520, in do_merge self._compute_transform() File "C:\Python25\Lib\site-packages\bzrlib\merge.py", line 558, in _compute_transform file_status = self.merge_contents(file_id) File "C:\Python25\Lib\site-packages\bzrlib\merge.py", line 856, in merge_contents return contents_conflict() File "C:\Python25\Lib\site-packages\bzrlib\merge.py", line 803, in contents_conflict set_version=True) File "C:\Python25\Lib\site-packages\bzrlib\merge.py", line 926, in _dump_conflicts suffix, lines) File "C:\Python25\Lib\site-packages\bzrlib\merge.py", line 939, in _conflict_file create_by_entry(self.tt, entry, tree, trans_id, lines) File "C:\Python25\Lib\site-packages\bzrlib\transform.py", line 1716, in create_by_entry lines = tree.get_file(entry.file_id).readlines() File "C:\Python25\Lib\site-packages\bzrlib\workingtree_4.py", line 1564, in get_file return StringIO(self.get_file_text(file_id)) File "C:\Python25\Lib\site-packages\bzrlib\workingtree_4.py", line 1576, in get_file_text return ''.join(self.get_file_lines(file_id)) File "C:\Python25\Lib\site-packages\bzrlib\workingtree_4.py", line 1570, in get_file_lines return self._get_weave(file_id).get_lines(entry[1][4]) File "C:\Python25\Lib\site-packages\bzrlib\knit.py", line 1099, in get_lines return self.get_line_list([version_id])[0] File "C:\Python25\Lib\site-packages\bzrlib\knit.py", line 1138, in get_line_list text_map, content_map = self._get_content_maps(version_ids) File "C:\Python25\Lib\site-packages\bzrlib\knit.py", line 1156, in _get_content_maps record_map = self._get_record_map(version_ids) File "C:\Python25\Lib\site-packages\bzrlib\knit.py", line 1115, in _get_record_map position_map = self._get_components_positions(version_ids) File "C:\Python25\Lib\site-packages\bzrlib\knit.py", line 947, in _get_components_positions build_details = self._index.get_build_details(pending_components) File "C:\Python25\Lib\site-packages\bzrlib\knit.py", line 1807, in get_build_details for entry in entries: File "C:\Python25\Lib\site-packages\bzrlib\knit.py", line 1698, in _get_entries raise RevisionNotPresent(missing_keys.pop(), self) RevisionNotPresent: Revision {('',)} not present in "". 3.000 return code 3