Rev 2403: (John Arbash Meinel) Fix bug #103757 by teaching common_ancestor to shortcut when a tip is in the other ancestry. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2403
revision-id: pqm at pqm.ubuntu.com-20070411015343-51539420298ee77c
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
parent: john at arbash-meinel.com-20070411012920-wnp7rnqdwe13xmhx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-11 02:53:43 +0100
message:
  (John Arbash Meinel) Fix bug #103757 by teaching common_ancestor to shortcut when a tip is in the other ancestry.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070411012920-wnp7rnqdwe13xmhx
    parent: john at arbash-meinel.com-20070410191541-rj635kcwkp305bo7
    parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: shortcut-common-ancestor
    timestamp: Tue 2007-04-10 20:29:20 -0500
    message:
      [merge] bzr.dev 2402
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070410191541-rj635kcwkp305bo7
    parent: john at arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: shortcut-common-ancestor
    timestamp: Tue 2007-04-10 14:15:41 -0500
    message:
      NEWS about fixing bug #103757
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
    parent: john at arbash-meinel.com-20070410181305-9y6qbm51we9k37kz
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: shortcut-common-ancestor
    timestamp: Tue 2007-04-10 13:30:32 -0500
    message:
      We don't need to extract ancestry_b until we after we've checked for existence.
      It seems to make sense to check 'b in ancestry_a' first, though we might consider checking
      a in ancestry_b first.
      b in a is merging something which has already been merged.
      a in b is merging something which has merged you.
      And 'a in b' may actually be more common.
      The timing difference is fairly small, though.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070410181305-9y6qbm51we9k37kz
    parent: john at arbash-meinel.com-20070410175723-9a3rljph39ot4e35
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: shortcut-common-ancestor
    timestamp: Tue 2007-04-10 13:13:05 -0500
    message:
      Ancestry checks can be done using the dictionaries
      And we don't need to create 2 sets, one will do just fine.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070410175723-9a3rljph39ot4e35
    parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: shortcut-common-ancestor
    timestamp: Tue 2007-04-10 12:57:23 -0500
    message:
      Shortcut the common_ancestor code when one tip is in the ancestry of the other.