Rev 1621: Reduced spurious conflicts in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1621
revision-id: pqm at pqm.ubuntu.com-20060407211144-0d74356b1cc77c00
parent: pqm at pqm.ubuntu.com-20060407062030-1277bbf3d808f04f
parent: abentley at panoramicfeedback.com-20060407195245-ef4ed2a5b022450d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-07 22:11:44 +0100
message:
  Reduced spurious conflicts
modified:
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060407195245-ef4ed2a5b022450d
    parent: abentley at panoramicfeedback.com-20060407194155-0740c494052ed879
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.spurious-conflict
    timestamp: Fri 2006-04-07 15:52:45 -0400
    message:
      WorkingTree.revert returns conflicts
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060407194155-0740c494052ed879
    parent: aaron.bentley at utoronto.ca-20060331061315-ebcb7d46bedccf0b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.spurious-conflict
    timestamp: Fri 2006-04-07 15:41:55 -0400
    message:
      Additional spurious conflict test
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060331061315-ebcb7d46bedccf0b
    parent: aaron.bentley at utoronto.ca-20060331020235-369b764c5e0478f7
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.spurious-conflict
    timestamp: Fri 2006-03-31 01:13:15 -0500
    message:
      Avoid spurious conflict on add/delete