Rev 1831: Remerge doesn't clobber conflicts on other files in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1831
revision-id: pqm at pqm.ubuntu.com-20060702194818-ba2ec54220591dcf
parent: pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
parent: aaron.bentley at utoronto.ca-20060702193142-16e6b7554e3620db
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-07-02 20:48:18 +0100
message:
  Remerge doesn't clobber conflicts on other files
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060702193142-16e6b7554e3620db
    parent: aaron.bentley at utoronto.ca-20060702174537-91ecf9e179632707
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-07-02 15:31:42 -0400
    message:
      Switched from actual, expected to expected, actual, for John.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060702174537-91ecf9e179632707
    parent: aaron.bentley at utoronto.ca-20060702173533-e3defd8577472473
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-07-02 13:45:37 -0400
    message:
      Fix spacing
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060702173533-e3defd8577472473
    parent: aaron.bentley at utoronto.ca-20060702003110-3d19fd4e139321ff
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-07-02 13:35:33 -0400
    message:
      Add WorkingTree.add_conflicts
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060702003110-3d19fd4e139321ff
    parent: aaron.bentley at utoronto.ca-20060701183657-5426563f230a6232
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2006-07-01 20:31:10 -0400
    message:
      Remerge doesn't clear unrelated conflicts