Rev 1597: Fix common_ancestor to still calculate a common ancestor when ghosts are present along all paths of ancestry - there are no 'import' revisions available. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1597
revision-id: pqm at pqm.ubuntu.com-20060322194741-02adb9a088203f30
parent: pqm at pqm.ubuntu.com-20060322121700-79ce0be81013aba1
parent: robertc at robertcollins.net-20060322162609-fd4ba4a57afd33ed
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-22 19:47:41 +0000
message:
  Fix common_ancestor to still calculate a common ancestor when ghosts are present along all paths of ancestry - there are no 'import' revisions available.
modified:
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/tests/test_graph.py     testgraph.py-20050905070950-42e6c958106610fd
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060322162609-fd4ba4a57afd33ed
    parent: robertc at robertcollins.net-20060322132114-cc057ded01411a94
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-03-23 03:26:09 +1100
    message:
      Fix common_ancestor to still calculate a common ancestor when ghosts are
      present along all paths of ancestry - there are no 'import' revisions
      available.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060322132114-cc057ded01411a94
    parent: robertc at robertcollins.net-20060321124137-b9028b082c63d99d
    parent: pqm at pqm.ubuntu.com-20060322121700-79ce0be81013aba1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-03-23 00:21:14 +1100
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060321124137-b9028b082c63d99d
    parent: robertc at robertcollins.net-20060320073835-61854f8dc05101b0
    parent: pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2006-03-21 23:41:37 +1100
    message:
      Merge bzr.dev.