Rev 2268: Commit supports kind changes in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2268
revision-id: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
parent: pqm at pqm.ubuntu.com-20070206193545-d5eac67ff047ce5c
parent: abentley at panoramicfeedback.com-20070206153230-39dpslyj1bkk781l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-06 20:54:42 +0000
message:
  Commit supports kind changes
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070206153230-39dpslyj1bkk781l
    parent: abentley at panoramicfeedback.com-20070206145804-a71ecyr3hgh8vhma
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: typechange
    timestamp: Tue 2007-02-06 10:32:30 -0500
    message:
      Ensure merge works across kind changes
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070206145804-a71ecyr3hgh8vhma
    parent: abentley at panoramicfeedback.com-20070206145406-yconkndx4kesw9q3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: typechange
    timestamp: Tue 2007-02-06 09:58:04 -0500
    message:
      add NEWS entry
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070206145406-yconkndx4kesw9q3
    parent: abentley at panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: typechange
    timestamp: Tue 2007-02-06 09:54:06 -0500
    message:
      Trim trailing whitespace
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
    parent: abentley at panoramicfeedback.com-20060928134810-2c8ae086a4a70f43
    parent: pqm at pqm.ubuntu.com-20070205115536-6fb4bf1e665880ac
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: typechange
    timestamp: Tue 2007-02-06 09:52:16 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060928134810-2c8ae086a4a70f43
    parent: aaron.bentley at utoronto.ca-20060826203316-d7112744d0ea94fc
    parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: typechange
    timestamp: Thu 2006-09-28 09:48:10 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060826203316-d7112744d0ea94fc
    parent: pqm at pqm.ubuntu.com-20060825200624-719b2ca847a04dfa
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: typechange
    timestamp: Sat 2006-08-26 16:33:16 -0400
    message:
      Correctly handle all file kind changes