Rev 2326: (Dmitry Vasiliev) Small fixes to cmd_diff in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2326
revision-id: pqm at pqm.ubuntu.com-20070308215322-265e2cf0b768f432
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
parent: john at arbash-meinel.com-20070308174644-shb8ue22yqlnmo8d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-08 21:53:22 +0000
message:
  (Dmitry Vasiliev) Small fixes to cmd_diff
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070308174644-shb8ue22yqlnmo8d
    parent: john at arbash-meinel.com-20070308174053-y1r0glqavi8iulez
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2007-03-08 11:46:44 -0600
    message:
      Add (eg "old/:new/") to errors to make it a little clearer.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070308174053-y1r0glqavi8iulez
    parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
    parent: dima at hlabs.spb.ru-20070308094114-hqx0n9cu1w6z34ax
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2007-03-08 11:40:53 -0600
    message:
      [merge] Dmitry's updates to cmd_diff
    ------------------------------------------------------------
    merged: dima at hlabs.spb.ru-20070308094114-hqx0n9cu1w6z34ax
    parent: dima at hlabs.spb.ru-20070308061932-iyxo5y77cabdfgtj
    committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
    branch nick: Small fixes
    timestamp: Thu 2007-03-08 12:41:14 +0300
    message:
      Added test for bzr diff --prefix illegal_value
    ------------------------------------------------------------
    merged: dima at hlabs.spb.ru-20070308061932-iyxo5y77cabdfgtj
    parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
    committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
    branch nick: Small fixes
    timestamp: Thu 2007-03-08 09:19:32 +0300
    message:
      Small fixes for bzr diff