Rev 2366: (John Arbash Meinel) fix bug #93681 by not calling _make_absent for removed entries. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2366
revision-id: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
parent: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
parent: john at arbash-meinel.com-20070320215406-ral0r0d52fgh513i
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 22:23:07 +0000
message:
  (John Arbash Meinel) fix bug #93681 by not calling _make_absent for removed entries.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070320215406-ral0r0d52fgh513i
    parent: john at arbash-meinel.com-20070320010014-d4qj0b1lyd6mi9ak
    parent: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate_93681
    timestamp: Tue 2007-03-20 16:54:06 -0500
    message:
      [merge] bzr.dev 2365
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070320010014-d4qj0b1lyd6mi9ak
    parent: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate_93681
    timestamp: Mon 2007-03-19 20:00:14 -0500
    message:
      NEWS for fixing bug #93681
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
    parent: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate_93681
    timestamp: Mon 2007-03-19 19:55:43 -0500
    message:
      Just check if the entry is absent before calling _make_absent.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
    parent: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate_93681
    timestamp: Mon 2007-03-19 19:49:11 -0500
    message:
      Simplify the test even further....
      Basically, if you have a file deleted as removed, and then you unversion its directory
      it deletes all records in the dirblock, not realizing that some of them might
      already be marked as removed.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
    parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate_93681
    timestamp: Mon 2007-03-19 19:41:04 -0500
    message:
      (broken) Add a simplified test which exposes the bug.