Rev 1987: Improve conflict message for deleting directories with contents in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1987
revision-id: pqm at pqm.ubuntu.com-20060906122016-54ab3159023ef544
parent: pqm at pqm.ubuntu.com-20060905233301-2e69db43982088ae
parent: aaron.bentley at utoronto.ca-20060906120001-b3d70c642260d590
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-06 13:20:16 +0100
message:
  Improve conflict message for deleting directories with contents
modified:
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060906120001-b3d70c642260d590
    parent: aaron.bentley at utoronto.ca-20060906024754-01d97ef6178594f5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-09-06 08:00:01 -0400
    message:
      Tweaked conflict message to be more understandable
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060906024754-01d97ef6178594f5
    parent: aaron.bentley at utoronto.ca-20060905032826-d1e87f8b82bdb4cb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-09-05 22:47:54 -0400
    message:
      Improve message when OTHER deletes an in-use tree
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060905032826-d1e87f8b82bdb4cb
    parent: abentley at panoramicfeedback.com-20060830132022-f1abf26606b57595
    parent: pqm at pqm.ubuntu.com-20060904084408-ebdbb37a1cdb0c53
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Mon 2006-09-04 23:28:26 -0400
    message:
      Merge bzr.dev