Rev 1424: [merge] make sure to get all text revisions during merge (aaron) in /home/mbp/work/bzr.dev

------------------------------------------------------------
revno: 1424
revision-id: mbp at sourcefrog.net-20051122033237-5099d6acc4751400
parent: mbp at sourcefrog.net-20051121085156-4fc6a9921c2cc723
parent: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-22 14:32:37 +1100
message:
  [merge] make sure to get all text revisions during merge (aaron)
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051119225637-e7afc16a06a31b59
    parent: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2005-11-19 17:56:37 -0500
    message:
      Fixed fetch to be safer wrt ghosts and corrupt branches
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051119200756-339f5a64abed668d
    parent: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2005-11-19 15:07:56 -0500
    message:
      Added repr for Weave
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051118144716-c27df491076e98f3
    parent: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
    parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Fri 2005-11-18 09:47:16 -0500
    message:
      Merge from Martin
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117204623-4265b87790561ee4
    parent: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Thu 2005-11-17 15:46:23 -0500
    message:
      Removed unused var
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117204200-efd6b944e3f7a6be
    parent: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Thu 2005-11-17 15:42:00 -0500
    message:
      Removed debugging code
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117155155-bdf57cc1c7efb11d
    parent: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Thu 2005-11-17 10:51:55 -0500
    message:
      Removed debug prints
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117154631-2d0eb45521b98363
    parent: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
    parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Thu 2005-11-17 10:46:31 -0500
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117154041-912d8f3bdd7d5a62
    parent: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Thu 2005-11-17 10:40:41 -0500
    message:
      Detect AWOL inventory revisions all at once
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117150928-f40f1a19c81473fb
    parent: aaron.bentley at utoronto.ca-20051116050009-f9639470edb47a84
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Thu 2005-11-17 10:09:28 -0500
    message:
      Made bzr check for stored revisions missing from ancestry