Rev 1442: [merge] aaron in /home/mbp/work/bzr.dev

------------------------------------------------------------
revno: 1442
revision-id: mbp at sourcefrog.net-20051125040741-a49e7d347c01d531
parent: mbp at sourcefrog.net-20051125040609-9053145620fdc52b
parent: aaron.bentley at utoronto.ca-20051124060520-0279acee0f7c1d70
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:07:41 +1100
message:
  [merge] aaron
modified:
  bzrlib/changeset.py            changeset.py-20050513021216-b02ab57fb9738913
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051124060520-0279acee0f7c1d70
    parent: aaron.bentley at utoronto.ca-20051124041913-de24c05411cdc948
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2005-11-24 01:05:20 -0500
    message:
      Tweaked tree name generation when applying changesets
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051124041913-de24c05411cdc948
    parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2005-11-23 23:19:13 -0500
    message:
      Handled cases where inventory entries need renaming but files don't exist