← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Andrew Bennetts
  • Date: 2010-12-01 04:20:41 UTC
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20101201042041-8h1qwrem033k46m1
Fetch tags during merge too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
135
135
                    self.target_repo, self.source_repo)
136
136
        heads_to_fetch = set(self.explicit_rev_ids)
137
137
        if self.source_branch is not None:
138
 
            heads_to_fetch.update(
139
 
                self.source_branch.tags.get_reverse_tag_dict())
 
138
            try:
 
139
                heads_to_fetch.update(
 
140
                    self.source_branch.tags.get_reverse_tag_dict())
 
141
            except errors.TagsNotSupported:
 
142
                pass
140
143
            heads_to_fetch.add(self.source_branch.last_revision())
141
144
        if self.target_repo_kind == _TargetRepoKinds.EMPTY:
142
145
            return graph.PendingAncestryResult(heads_to_fetch, self.source_repo)