Rev 2334: Fix WorkingTree4._iter_changes with pending merges and deleted files in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2334
revision-id: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
parent: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
parent: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 23:25:35 +0000
message:
  Fix WorkingTree4._iter_changes with pending merges and deleted files
modified:
  bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
    parent: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2007-03-10 16:39:07 -0500
    message:
      Fix WorkingTree4._iter_changes with pending merges and deleted files