Rev 1430: [merge] jelmer in /home/mbp/work/bzr.dev

------------------------------------------------------------
revno: 1430
revision-id: mbp at sourcefrog.net-20051123011409-c7bd7982cf710184
parent: mbp at sourcefrog.net-20051123004549-32b59267a00938bf
parent: jelmer at samba.org-20051121201056-b5b364b20cb58115
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 12:14:09 +1100
message:
  [merge] jelmer
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051121201056-b5b364b20cb58115
    parent: jelmer at samba.org-20051121175528-358e070f5f303534
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: jelmer.integration
    timestamp: Mon 2005-11-21 21:10:56 +0100
    message:
      Don't clear Revision.parent_ids after it has been set from the arguments
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051121175528-358e070f5f303534
    parent: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: jelmer.integration
    timestamp: Mon 2005-11-21 18:55:28 +0100
    message:
      Make get_revision_xml_file() private
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
    parent: jelmer at samba.org-20051120193851-91fb5ea757facb74
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: jelmer.integration
    timestamp: Sun 2005-11-20 21:44:42 +0100
    message:
      Remove methods from BzrBranch that were already implemented in Branch
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051120193851-91fb5ea757facb74
    parent: jelmer at samba.org-20051120192409-32999f70ba448f5f
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: integration
    timestamp: Sun 2005-11-20 20:38:51 +0100
    message:
      Fix error that was declared twice
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051120192409-32999f70ba448f5f
    parent: jelmer at samba.org-20051118005738-6a5a3f5db00432bd
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: integration
    timestamp: Sun 2005-11-20 20:24:09 +0100
    message:
      Remove some abstract methods that were no longer used.
      
    ------------------------------------------------------------
    merged: jelmer at samba.org-20051118005738-6a5a3f5db00432bd
    parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
    committer: Jelmer Vernooij <jelmer at samba.org>
    timestamp: Fri 2005-11-18 01:57:38 +0100
    message:
      Remove already fixed items from TODO