Rev 1686: Fix pending-merge status on trees with no commits in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1686
revision-id: pqm at pqm.ubuntu.com-20060517130345-d45c52df5faef54c
parent: pqm at pqm.ubuntu.com-20060517085040-ee6e33957c557fba
parent: abentley at panoramicfeedback.com-20060517125217-46dfd6c3be1b1193
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-05-17 14:03:45 +0100
message:
  Fix pending-merge status on trees with no commits
added:
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060517125217-46dfd6c3be1b1193
    parent: abentley at panoramicfeedback.com-20060516190620-aab481f687163d1e
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-05-17 08:52:17 -0400
    message:
      Add copyright and whitespace
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060516190620-aab481f687163d1e
    parent: abentley at panoramicfeedback.com-20060516185001-2766898ed95949fa
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-05-16 15:06:20 -0400
    message:
      Fix pending merge status on empty trees
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060516185001-2766898ed95949fa
    parent: abentley at lappy-20060419051720-a0df814c328384a7
    parent: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-05-16 14:50:01 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at lappy-20060419051720-a0df814c328384a7
    parent: aaron.bentley at utoronto.ca-20060418022414-28c7228e9c99bd4d
    parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
    committer: abentley <abentley at lappy>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-04-19 01:17:20 -0400
    message:
      Merge from dev