← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Andrew Bennetts
  • Date: 2010-12-02 01:59:52 UTC
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20101202015952-4zdgxwi3975rscd1
Fix a bug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1073
1073
        """
1074
1074
        if not self.repository.has_same_location(source.repository):
1075
1075
            try:
1076
 
                revs_to_fetch = set(source.tags.get_reverse_tag_dict())
 
1076
                tags_to_fetch = set(source.tags.get_reverse_tag_dict())
1077
1077
            except errors.TagsNotSupported:
1078
 
                revs_to_fetch = set()
 
1078
                tags_to_fetch = set()
1079
1079
            revs_to_fetch.add(revid)
1080
1080
            fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
1081
 
                source.repository, revs_to_fetch)
 
1081
                source.repository, [revid], if_present_ids=tags_to_fetch)
1082
1082
            self.repository.fetch(source.repository, fetch_spec=fetch_spec)
1083
1083
        self.set_last_revision_info(revno, revid)
1084
1084
 
3458
3458
        if fetch_tags:
3459
3459
            fetch_spec_factory = controldir.FetchSpecFactory()
3460
3460
            fetch_spec_factory.source_branch = self.source
 
3461
            fetch_spec_factory.source_branch_stop_revision = stop_revision
3461
3462
            fetch_spec_factory.source_repo = self.source.repository
3462
3463
            fetch_spec_factory.target_repo = self.target.repository
3463
3464
            fetch_spec_factory.target_repo_kind = controldir._TargetRepoKinds.PREEXISTING