Rev 1598: Upgrade works in repositories in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1598
revision-id: pqm at pqm.ubuntu.com-20060323181104-5f493e4935693338
parent: pqm at pqm.ubuntu.com-20060322194741-02adb9a088203f30
parent: abentley at panoramicfeedback.com-20060323151308-ce1d9f3ad45b0454
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-23 18:11:04 +0000
message:
  Upgrade works in repositories
modified:
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060323151308-ce1d9f3ad45b0454
    parent: abentley at panoramicfeedback.com-20060323145152-283b0bacfb77123d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab.integration
    timestamp: Thu 2006-03-23 10:13:08 -0500
    message:
      Future-proofed the test_upgrade_repo test
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060323145152-283b0bacfb77123d
    parent: aaron.bentley at utoronto.ca-20060323034108-4ff0bfd362bc55bf
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab.integration
    timestamp: Thu 2006-03-23 09:51:52 -0500
    message:
      Upgrade works in repositories
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060323034108-4ff0bfd362bc55bf
    parent: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
    parent: pqm at pqm.ubuntu.com-20060322194741-02adb9a088203f30
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Wed 2006-03-22 22:41:08 -0500
    message:
      Merge bzr.dev