Rev 1977: Behave reasonably when creating a checkout in a directory with files in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1977
revision-id: pqm at pqm.ubuntu.com-20060831060638-bfc0303de36a40a8
parent: pqm at pqm.ubuntu.com-20060831055948-19f9ac43952da1c6
parent: aaron.bentley at utoronto.ca-20060830035434-3bbd78d351716cc5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-08-31 07:06:38 +0100
message:
  Behave reasonably when creating a checkout in a directory with files
modified:
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060830035434-3bbd78d351716cc5
    parent: abentley at panoramicfeedback.com-20060829181741-4360542e119ff839
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: build-resolver
    timestamp: Tue 2006-08-29 23:54:34 -0400
    message:
      Divert files instead of failing to create them, update from review
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060829181741-4360542e119ff839
    parent: pqm at pqm.ubuntu.com-20060828224959-5430e7c7b4cb08c8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: build-resolver
    timestamp: Tue 2006-08-29 14:17:41 -0400
    message:
      Implement disk-content merge and conflict resolution for build_tree