Rev 2264: Support kind changes in tree deltas in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2264
revision-id: pqm at pqm.ubuntu.com-20070204152137-9848ed97ad8e6a88
parent: pqm at pqm.ubuntu.com-20070204143007-ee1d0712bf5bccdf
parent: abentley at panoramicfeedback.com-20070202152938-96tdyxy8lcg7j802
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-04 15:21:37 +0000
message:
  Support kind changes in tree deltas
modified:
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/tests/test_delta.py     test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070202152938-96tdyxy8lcg7j802
    parent: abentley at panoramicfeedback.com-20070202135202-78r1yntnepqcuic2
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2007-02-02 10:29:38 -0500
    message:
      Support kind changes in tree deltas
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070202135202-78r1yntnepqcuic2
    parent: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
    parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2007-02-02 08:52:02 -0500
    message:
      Merge bzr.dev