Rev 2247: Handle merge with dangling inventory entries in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2247
revision-id: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
parent: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
parent: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-31 14:04:56 +0000
message:
  Handle merge with dangling inventory entries
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
    parent: aaron.bentley at utoronto.ca-20070131020421-a9fhra61hiwr0kcb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2007-01-30 22:51:36 -0500
    message:
      Handle merge with dangling inventory entries
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070131020421-a9fhra61hiwr0kcb
    parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
    parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2007-01-30 21:04:21 -0500
    message:
      Merge bzr.dev