Okay, so I ran 'bzr reconcile' for a little while, about 45 minutes or so. It wasn't finishing and I got tired of waiting so I hit cntrl-c on it. Now my revisions are correct. Here's the log. I'm not sure if it helps anything:
Sun 2009-06-21 22:50:54 -0500
0.046 bzr arguments: [u'reconcile']
0.083 looking for plugins in /home/ted/.bazaar/plugins
0.235 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.270 encoding stdout as sys.stdout encoding 'UTF-8'
Sun 2009-06-21 22:51:08 -0500
0.017 bzr arguments: [u'help', u'reconcile']
0.029 looking for plugins in /home/ted/.bazaar/plugins
0.190 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.223 encoding stdout as sys.stdout encoding 'UTF-8'
0.350 return code 0
171.824 Resizing the inventory entry cache from 10240 to 14224
199.467 Resizing the inventory entry cache from 14224 to 19144
421.913 Resizing the inventory entry cache from 19144 to 25578
557.380 Resizing the inventory entry cache from 25578 to 34200
1039.470 Resizing the inventory entry cache from 34200 to 45670
1485.822 Resizing the inventory entry cache from 45670 to 61320
2749.014 Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 729, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 924, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 560, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 1495, in run
reconcile(dir)
File "/usr/lib/python2.6/dist-packages/bzrlib/reconcile.py", line 53, in reconcile
reconciler.reconcile()
File "/usr/lib/python2.6/dist-packages/bzrlib/reconcile.py", line 77, in reconcile
self._reconcile()
File "/usr/lib/python2.6/dist-packages/bzrlib/reconcile.py", line 84, in _reconcile
self._reconcile_repository()
File "/usr/lib/python2.6/dist-packages/bzrlib/reconcile.py", line 103, in _reconcile_repository
repo_reconciler = self.repo.reconcile(thorough=True)
File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in write_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/repofmt/pack_repo.py", line 2358, in reconcile
reconciler.reconcile()
File "/usr/lib/python2.6/dist-packages/bzrlib/reconcile.py", line 200, in reconcile
self._reconcile_steps()
File "/usr/lib/python2.6/dist-packages/bzrlib/reconcile.py", line 514, in _reconcile_steps
".reconcile", all_revisions, self.pb)
File "/usr/lib/python2.6/dist-packages/bzrlib/repofmt/pack_repo.py", line 2363, in _reconcile_pack
return packer.pack(pb)
File "/usr/lib/python2.6/dist-packages/bzrlib/repofmt/pack_repo.py", line 753, in pack
return self._create_pack_from_packs()
File "/usr/lib/python2.6/dist-packages/bzrlib/repofmt/pack_repo.py", line 916, in _create_pack_from_packs
self._copy_text_texts()
File "/usr/lib/python2.6/dist-packages/bzrlib/repofmt/pack_repo.py", line 1295, in _copy_text_texts
self.new_pack.text_index, readv_group_iter, total_items))
File "/usr/lib/python2.6/dist-packages/bzrlib/repofmt/pack_repo.py", line 1048, in _copy_nodes_graph
write_index, output_lines, pb, readv_group_iter, total_items):
File "/usr/lib/python2.6/dist-packages/bzrlib/repofmt/pack_repo.py", line 1077, in _do_copy_nodes_graph
izip(reader.iter_records(), node_vector):
File "/usr/lib/python2.6/dist-packages/bzrlib/pack.py", line 272, in _iter_records
for record in self._iter_record_objects():
File "/usr/lib/python2.6/dist-packages/bzrlib/pack.py", line 277, in _iter_record_objects
record_kind = self.reader_func(1)
File "/usr/lib/python2.6/dist-packages/bzrlib/pack.py", line 218, in reader_func
return self._source.read(length)
File "/usr/lib/python2.6/dist-packages/bzrlib/pack.py", line 177, in read
self._next()
File "/usr/lib/python2.6/dist-packages/bzrlib/pack.py", line 172, in _next
length, data = self.readv_result.next()
File "/usr/lib/python2.6/dist-packages/bzrlib/transport/__init__.py", line 698, in _seek_and_read
data = fp.read(c_offset.length)
KeyboardInterrupt
2749.143 return code 3
Sun 2009-06-21 23:37:02 -0500
1.417 bzr arguments: [u'revno']
1.745 looking for plugins in /home/ted/.bazaar/plugins
10.308 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
11.700 encoding stdout as sys.stdout encoding 'UTF-8'
12.464 return code 0
Okay, so I ran 'bzr reconcile' for a little while, about 45 minutes or so. It wasn't finishing and I got tired of waiting so I hit cntrl-c on it. Now my revisions are correct. Here's the log. I'm not sure if it helps anything:
Sun 2009-06-21 22:50:54 -0500 .bazaar/ plugins python2. 6/dist- packages/ bzrlib/ plugins
0.046 bzr arguments: [u'reconcile']
0.083 looking for plugins in /home/ted/
0.235 looking for plugins in /usr/lib/
0.270 encoding stdout as sys.stdout encoding 'UTF-8'
Sun 2009-06-21 22:51:08 -0500 .bazaar/ plugins python2. 6/dist- packages/ bzrlib/ plugins python2. 6/dist- packages/ bzrlib/ commands. py", line 729, in exception_ to_return_ code python2. 6/dist- packages/ bzrlib/ commands. py", line 924, in run_bzr python2. 6/dist- packages/ bzrlib/ commands. py", line 560, in run_argv_aliases **all_cmd_ args) python2. 6/dist- packages/ bzrlib/ builtins. py", line 1495, in run python2. 6/dist- packages/ bzrlib/ reconcile. py", line 53, in reconcile reconcile( ) python2. 6/dist- packages/ bzrlib/ reconcile. py", line 77, in reconcile _reconcile( ) python2. 6/dist- packages/ bzrlib/ reconcile. py", line 84, in _reconcile _reconcile_ repository( ) python2. 6/dist- packages/ bzrlib/ reconcile. py", line 103, in _reconcile_ repository reconcile( thorough= True) python2. 6/dist- packages/ bzrlib/ decorators. py", line 192, in write_locked python2. 6/dist- packages/ bzrlib/ repofmt/ pack_repo. py", line 2358, in reconcile reconcile( ) python2. 6/dist- packages/ bzrlib/ reconcile. py", line 200, in reconcile _reconcile_ steps() python2. 6/dist- packages/ bzrlib/ reconcile. py", line 514, in _reconcile_steps python2. 6/dist- packages/ bzrlib/ repofmt/ pack_repo. py", line 2363, in _reconcile_pack python2. 6/dist- packages/ bzrlib/ repofmt/ pack_repo. py", line 753, in pack pack_from_ packs() python2. 6/dist- packages/ bzrlib/ repofmt/ pack_repo. py", line 916, in _create_ pack_from_ packs _copy_text_ texts() python2. 6/dist- packages/ bzrlib/ repofmt/ pack_repo. py", line 1295, in _copy_text_texts new_pack. text_index, readv_group_iter, total_items)) python2. 6/dist- packages/ bzrlib/ repofmt/ pack_repo. py", line 1048, in _copy_nodes_graph python2. 6/dist- packages/ bzrlib/ repofmt/ pack_repo. py", line 1077, in _do_copy_ nodes_graph reader. iter_records( ), node_vector): python2. 6/dist- packages/ bzrlib/ pack.py" , line 272, in _iter_records record_ objects( ): python2. 6/dist- packages/ bzrlib/ pack.py" , line 277, in _iter_record_ objects python2. 6/dist- packages/ bzrlib/ pack.py" , line 218, in reader_func read(length) python2. 6/dist- packages/ bzrlib/ pack.py" , line 177, in read python2. 6/dist- packages/ bzrlib/ pack.py" , line 172, in _next result. next() python2. 6/dist- packages/ bzrlib/ transport/ __init_ _.py", line 698, in _seek_and_read c_offset. length)
0.017 bzr arguments: [u'help', u'reconcile']
0.029 looking for plugins in /home/ted/
0.190 looking for plugins in /usr/lib/
0.223 encoding stdout as sys.stdout encoding 'UTF-8'
0.350 return code 0
171.824 Resizing the inventory entry cache from 10240 to 14224
199.467 Resizing the inventory entry cache from 14224 to 19144
421.913 Resizing the inventory entry cache from 19144 to 25578
557.380 Resizing the inventory entry cache from 25578 to 34200
1039.470 Resizing the inventory entry cache from 34200 to 45670
1485.822 Resizing the inventory entry cache from 45670 to 61320
2749.014 Traceback (most recent call last):
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
reconcile(dir)
File "/usr/lib/
reconciler.
File "/usr/lib/
self.
File "/usr/lib/
self.
File "/usr/lib/
repo_reconciler = self.repo.
File "/usr/lib/
result = unbound(self, *args, **kwargs)
File "/usr/lib/
reconciler.
File "/usr/lib/
self.
File "/usr/lib/
".reconcile", all_revisions, self.pb)
File "/usr/lib/
return packer.pack(pb)
File "/usr/lib/
return self._create_
File "/usr/lib/
self.
File "/usr/lib/
self.
File "/usr/lib/
write_index, output_lines, pb, readv_group_iter, total_items):
File "/usr/lib/
izip(
File "/usr/lib/
for record in self._iter_
File "/usr/lib/
record_kind = self.reader_func(1)
File "/usr/lib/
return self._source.
File "/usr/lib/
self._next()
File "/usr/lib/
length, data = self.readv_
File "/usr/lib/
data = fp.read(
KeyboardInterrupt
2749.143 return code 3
Sun 2009-06-21 23:37:02 -0500 .bazaar/ plugins python2. 6/dist- packages/ bzrlib/ plugins
1.417 bzr arguments: [u'revno']
1.745 looking for plugins in /home/ted/
10.308 looking for plugins in /usr/lib/
11.700 encoding stdout as sys.stdout encoding 'UTF-8'
12.464 return code 0