Assertion going off in 0.18

[Andrew King]

The following assertion went off after trying to commit a merge after
previously doing an uncommit (not sure if this is related or not).
Repeating the commit subsequently worked.


1.
      Traceback (most recent call last):
   2.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/commands.py",
line 729, in run_bzr_catch_errors
   3.
          return run_bzr(argv)
   4.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/commands.py",
line 691, in run_bzr
   5.
          ret = run(*run_argv)
   6.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/commands.py",
line 389, in run_argv_aliases
   7.
          return self.run(**all_cmd_args)
   8.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/builtins.py",
line 2199, in run
   9.
          reporter=reporter, revprops=properties)
  10.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/decorators.py",
line 165, in write_locked
  11.
          return unbound(self, *args, **kwargs)
  12.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/workingtree_4.py",
line 245, in commit
  13.
          result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  14.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/decorators.py",
line 165, in write_locked
  15.
          return unbound(self, *args, **kwargs)
  16.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/mutabletree.py",
line 207, in commit
  17.
          revprops=revprops, *args, **kwargs)
  18.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/commit.py",
line 303, in commit
  19.
          self._update_builder_with_changes()
  20.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/commit.py",
line 691, in _update_builder_with_changes
  21.
          self.work_tree.unversion(deleted_ids)
  22.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/mutabletree.py",
line 50, in tree_write_locked
  23.
          return unbound(self, *args, **kwargs)
  24.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/workingtree_4.py",
line 1188, in unversion
  25.
          if (entry[1][0][0] == 'a'
  26.
        File "/usr/local/lib/python2.4/site-packages/bzrlib/dirstate.py",
line 2068, in _make_absent
  27.
          assert update_tree_details[0][0] != 'a' # absent

Cheers,
Andrew