~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 2401.1.3.

  • Committer: John Arbash Meinel
  • Date: 2007-04-10 18:30:32 UTC
  • mto: This revision was merged to the branch mainline in revision 2403.
  • Revision ID: john@arbash-meinel.com-20070410183032-rw4d3kpb8f9cesfw
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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: