/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-07-26 19:51:56 UTC
  • mto: This revision was merged to the branch mainline in revision 2657.
  • Revision ID: abentley@panoramicfeedback.com-20070726195156-9zi1ke2v6tq274f3
Replace get_ancestry with is_ancestor

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2669
2669
                mergeable.install_revisions(tree.branch.repository)
2670
2670
                base_revision_id, other_revision_id, verified =\
2671
2671
                    mergeable.get_merge_request(tree.branch.repository)
2672
 
                if base_revision_id in tree.branch.repository.get_ancestry(
2673
 
                    tree.branch.last_revision(), topo_sorted=False):
 
2672
                if (base_revision_id != _mod_revision.NULL_REVISION and
 
2673
                    tree.branch.repository.get_graph().is_ancestor(
 
2674
                    base_revision_id, tree.branch.last_revision())):
2674
2675
                    base_revision_id = None
2675
2676
                other_branch = None
2676
2677
                path = ''