Rev 1573: Fix for merge_modified error handling in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1573
revision-id: pqm at pqm.ubuntu.com-20060308051838-876e9f9ac39ee578
parent: pqm at pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 05:18:38 +0000
message:
  Fix for merge_modified error handling
modified:
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
    parent: abentley at panoramicfeedback.com-20060307173814-27971f46eb6324bc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2006-03-07 13:41:18 -0500
    message:
      Fix error handling for merge_modified
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307173814-27971f46eb6324bc
    parent: abentley at panoramicfeedback.com-20060306170942-4961a715a61df91f
    parent: pqm at pqm.ubuntu.com-20060307161548-62e73f80c62f6a31
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2006-03-07 12:38:14 -0500
    message:
      Merge from bzr.dev