Rev 2316: resolve auto-resolves text conflicts by default in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2316
revision-id: pqm at pqm.ubuntu.com-20070305225859-31c72fc6c3778b82
parent: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
parent: aaron.bentley at utoronto.ca-20070305224322-1w0aqoao1hsf4o2n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-05 22:58:59 +0000
message:
  resolve auto-resolves text conflicts by default
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070305224322-1w0aqoao1hsf4o2n
    parent: abentley at panoramicfeedback.com-20070305211241-4maj27f7t9ik2vvz
    parent: pqm at pqm.ubuntu.com-20070305220713-41e023034592cca1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: autoconflicts
    timestamp: Mon 2007-03-05 17:43:22 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070305211241-4maj27f7t9ik2vvz
    parent: aaron.bentley at utoronto.ca-20070303171753-o0s1yrxx5sn12p2k
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: autoconflicts
    timestamp: Mon 2007-03-05 16:12:41 -0500
    message:
      Update NEWS
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070303171753-o0s1yrxx5sn12p2k
    parent: aaron.bentley at utoronto.ca-20070303170534-p6dy23ex94mi7d01
    parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: autoconflicts
    timestamp: Sat 2007-03-03 12:17:53 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070303170534-p6dy23ex94mi7d01
    parent: aaron.bentley at utoronto.ca-20070303162345-wn7k1x3v51372tjt
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: autoconflicts
    timestamp: Sat 2007-03-03 12:05:34 -0500
    message:
      Fix normal resolve
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070303162345-wn7k1x3v51372tjt
    parent: aaron.bentley at utoronto.ca-20070303010918-yqbf9rc8i2vhbcz4
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: autoconflicts
    timestamp: Sat 2007-03-03 11:23:45 -0500
    message:
      Update resolve command to automatically mark conflicts as resolved
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070303010918-yqbf9rc8i2vhbcz4
    parent: aaron.bentley at utoronto.ca-20061106063617-a5f6a95a8e672320
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: autoconflicts
    timestamp: Fri 2007-03-02 20:09:18 -0500
    message:
      Move autoresolve functionality to workingtree
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20061106063617-a5f6a95a8e672320
    parent: pqm at pqm.ubuntu.com-20061103025929-903e67f4ce75803d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: autoconflicts
    timestamp: Mon 2006-11-06 01:36:17 -0500
    message:
      Add auto-resolve support to commit