← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-06 15:15:44 UTC
  • mfrom: (5835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110506151544-atzxeezfwssnlacr
Merge bzr.dev 5835 in prep for release-notes updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
563
563
 
564
564
    def _maybe_fetch(self, source, target, revision_id):
565
565
        if not source.repository.has_same_location(target.repository):
566
 
            try:
567
 
                tags_to_fetch = set(source.tags.get_reverse_tag_dict())
568
 
            except errors.TagsNotSupported:
569
 
                tags_to_fetch = None
570
 
            fetch_spec = _mod_graph.NotInOtherForRevs(target.repository,
571
 
                source.repository, [revision_id],
572
 
                if_present_ids=tags_to_fetch).execute()
573
 
            target.fetch(source, fetch_spec=fetch_spec)
 
566
            target.fetch(source, revision_id)
574
567
 
575
568
    def find_base(self):
576
569
        revisions = [_mod_revision.ensure_null(self.this_basis),