← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.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/merge.py
565
565
 
566
566
    def _maybe_fetch(self, source, target, revision_id):
567
567
        if not source.repository.has_same_location(target.repository):
568
 
            target.fetch(source, revision_id)
 
568
            try:
 
569
                revs_to_fetch = set(source.tags.get_reverse_tag_dict())
 
570
            except errors.TagsNotSupported:
 
571
                revs_to_fetch = set()
 
572
            revs_to_fetch.add(revision_id)
 
573
            fetch_spec = _mod_graph.NotInOtherForRevs(target.repository,
 
574
                source.repository, revs_to_fetch)
 
575
            target.fetch(source, fetch_spec=fetch_spec)
569
576
 
570
577
    def find_base(self):
571
578
        revisions = [_mod_revision.ensure_null(self.this_basis),