Rev 1896: (robertc) Change status to not special case conflicts and instead just retrieve them from the standard tree interface. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1896
revision-id: pqm at pqm.ubuntu.com-20060729094454-81514a27f7375f36
parent: pqm at pqm.ubuntu.com-20060729090154-4c15e5a3dc32598d
parent: robertc at robertcollins.net-20060729093318-3ff7802c52d1d61e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-07-29 10:44:54 +0100
message:
  (robertc) Change status to not special case conflicts and instead just retrieve them from the standard tree interface.
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060729093318-3ff7802c52d1d61e
    parent: robertc at robertcollins.net-20060726074817-78581226f4efe2ed
    parent: robertc at robertcollins.net-20060729084623-db89454ce5f71cdd
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: status treats conflict as normal tree interface.
    timestamp: Sat 2006-07-29 19:33:18 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060726074817-78581226f4efe2ed
    parent: robertc at robertcollins.net-20060717072302-c398045e6dcc577d
    parent: robertc at robertcollins.net-20060726074121-d80a78a5c39c04c5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: status treats conflict as normal tree interface.
    timestamp: Wed 2006-07-26 17:48:17 +1000
    message:
      Merge Tree.changes_from work.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060717072302-c398045e6dcc577d
    parent: robertc at robertcollins.net-20060714052817-76f18c3e784ed1ef
    parent: robertc at robertcollins.net-20060717061459-f5e26c59c03c6507
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: status treats conflict as normal tree interface.
    timestamp: Mon 2006-07-17 17:23:02 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060714052817-76f18c3e784ed1ef
    parent: robertc at robertcollins.net-20060714051512-a7cb4146aacfc563
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: status treats conflict as normal tree interface.
    timestamp: Fri 2006-07-14 15:28:17 +1000
    message:
      Status should not special case conflicts on the tree type, rather just show the new trees conflicts regardless.