Rev 1591: Latest bzr.dev in /home/robertc/source/baz/integration/

[Robert Collins]

------------------------------------------------------------
revno: 1591
revision-id: robertc at robertcollins.net-20060320073835-61854f8dc05101b0
parent: robertc at robertcollins.net-20060320072604-c769364c9fb2ef0b
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-20 18:38:35 +1100
message:
  Latest bzr.dev
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
    parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
    parent: aaron.bentley at utoronto.ca-20060319154400-c58a9ec8b37b3e5d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-03-19 16:14:04 +0000
    message:
      Removed unused error
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060319154400-c58a9ec8b37b3e5d
    parent: aaron.bentley at utoronto.ca-20060318234051-415e5fcb51da82e4
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.mergeself
    timestamp: Sun 2006-03-19 10:44:00 -0500
    message:
      Removed unused error
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060318234051-415e5fcb51da82e4
    parent: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.mergeself
    timestamp: Sat 2006-03-18 18:40:51 -0500
    message:
      Allow merge against self, make fetching self a noop
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
    parent: abentley at panoramicfeedback.com-20060315172753-31fb96afb635cec1
    parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's integration
    timestamp: Thu 2006-03-16 23:43:00 -0500
    message:
      Merge bzr.dev