revno cache out of sync with actual branch revnos

The log is rather intermixed. On one of the terminals I have some useful scrollback:

$ bzr add album.xml
Unable to obtain lock file:///media/Photos/Photos/.bzr/checkout/lock
held by <email address hidden> on host shi [process #24574]
locked 6 seconds ago
Will continue to try until 22:49:59, unless you press Ctrl-C
If you're sure that it's not being modified, use bzr break-lock file:///media/Photos/Photos/.bzr/checkout/lock
adding Unsorted/2009/530_NathanSarah/album.xml
$ bzr commit -m "Album information for these guys' wedding" album.xml
Unable to obtain lock file:///media/Photos/Photos/.bzr/branch/lock
held by <email address hidden> on host shi [process #24579]
locked 20 seconds ago
Will continue to try until 22:50:55, unless you press Ctrl-C
If you're sure that it's not being modified, use bzr break-lock file:///media/Photos/Photos/.bzr/branch/lock
Committing to: /media/Photos/Photos/
added Unsorted/2009/530_NathanSarah/album.xml
Committed revision 1.
$

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_in...

Okay, this script will cause it on a new repository.

ted@shi:~/bzrbreaker$ ./doit.sh
Created a standalone tree (format: pack-0.92)
adding file1
Committing to: /home/ted/bzrbreaker/bob/
added file1
Committed revision 1.
4096+0 records in
4096+0 records out
2097152 bytes (2.1 MB) copied, 0.0304176 s, 68.9 MB/s
4096+0 records in
4096+0 records out
2097152 bytes (2.1 MB) copied, 0.0346657 s, 60.5 MB/s
adding file2
adding file3
Committing to: /home/ted/bzrbreaker/bob/
Unable to obtain lock file:///home/ted/bzrbreaker/bob/.bzr/branch/lock
held by <email address hidden> on host shi [process #1690]
locked 0 seconds ago
Will continue to try until 09:13:12, unless you press Ctrl-C
If you're sure that it's not being modified, use bzr break-lock file:///home/ted/bzrbreaker/bob/.bzr/branch/lock
added file2
Committed revision 2.
Committing to: /home/ted/bzrbreaker/bob/
added file3
Committed revision 1.
ted@shi:~/bzrbreaker$ cd bob
ted@shi:~/bzrbreaker/bob$ bzr log
------------------------------------------------------------
revno: 1
committer: Ted Gould <email address hidden>
branch nick: bob
timestamp: Mon 2009-06-22 09:08:13 -0500
message:
  File 3
------------------------------------------------------------
revno: 0
committer: Ted Gould <email address hidden>
branch nick: bob
timestamp: Mon 2009-06-22 09:08:12 -0500
message:
  File 2
------------------------------------------------------------
revno: -1
committer: Ted Gould <email address hidden>
branch nick: bob
timestamp: Mon 2009-06-22 09:08:10 -0500
message:
  File 1
ted@shi:~/bzrbreaker/bob$

hmm... I'll note that doing "bzr reconcile" should be able to fix this sort of thing.