Rev 2099: (Cheuksan Edward Wang) Partial fix for bug #48136, make status indicate when the tree is out of date with the branch in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2099
revision-id: pqm at pqm.ubuntu.com-20061027165927-baf73dad8985eaa7
parent: pqm at pqm.ubuntu.com-20061027161418-ed489293a9231843
parent: john at arbash-meinel.com-20061027164426-e39aabbcc8bc1441
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-10-27 17:59:27 +0100
message:
  (Cheuksan Edward Wang) Partial fix for bug #48136, make status indicate when the tree is out of date with the branch
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061027164426-e39aabbcc8bc1441
    parent: john at arbash-meinel.com-20061027164319-b8d220e77bce629c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2006-10-27 11:44:26 -0500
    message:
      Fix NEWS to put the fix for bug #48136 in the right location
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061027164319-b8d220e77bce629c
    parent: john at arbash-meinel.com-20061027164148-83142c9a003ecc43
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2006-10-27 11:43:19 -0500
    message:
      Remove changes to diff so it doesn't report out-of-date
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061027164148-83142c9a003ecc43
    parent: pqm at pqm.ubuntu.com-20061027161418-ed489293a9231843
    parent: wang at ubuntu-20061022041744-e03b72936888673c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2006-10-27 11:41:48 -0500
    message:
      [merge] Cheuksan Edward Wang: Report a warning if tree is out of date for diff and status
    ------------------------------------------------------------
    merged: wang at ubuntu-20061022041744-e03b72936888673c
    parent: wang at ubuntu-20061021075957-f1fcec87b9f4275a
    committer: wang <wang at ubuntu>
    branch nick: push-branch
    timestamp: Sun 2006-10-22 12:17:44 +0800
    message:
      add tests for "diff" and "status"
    ------------------------------------------------------------
    merged: wang at ubuntu-20061021075957-f1fcec87b9f4275a
    parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
    committer: wang <wang at ubuntu>
    branch nick: push-branch
    timestamp: Sat 2006-10-21 15:59:57 +0800
    message:
      Pushing to a remote branch does not currently update the remote working
      tree. After a remote push, ``bzr status`` and ``bzr diff`` on the remote
      machine now show that the working tree is out of date.