[MERGE][0.15][BUG 93681] During unversion don't call _make_absent on absent entries

[John Arbash Meinel]

So I tracked down the bug from:
https://launchpad.net/bzr/+bug/93681

Basically, if a file was already marked as removed, and then we
auto-removed the containing directory as part of commit, it would fail
because it tries to _make_absent() a record which is already marked as
absent.

The fix is really simple (just check if it is absent before calling
_make_absent).

The change is only multi-line because I also cleaned up the multiple
access to the same variable by using a local variable.

John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: dirstate_93681.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070319/72a5d481/attachment-0001.diff