← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_pull.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_pull.py
156
156
        except errors.TagsNotSupported:
157
157
            raise TestNotApplicable('format does not support tags.')
158
158
        source.tags.set_tag('tag-a', 'rev-2')
 
159
        source.get_config().set_user_option('branch.fetch_tags', 'True')
159
160
        target.pull(source)
160
161
        # The tag is present, and so is its revision.
161
162
        self.assertEqual('rev-2', target.tags.lookup_tag('tag-a'))
177
178
            source.tags.set_tag('tag-a', 'rev-2')
178
179
        except errors.TagsNotSupported:
179
180
            raise TestNotApplicable('format does not support tags.')
 
181
        source.get_config().set_user_option('branch.fetch_tags', 'True')
180
182
        target.pull(source, 'rev-2-again')
181
183
        # The tag is present, and so is its revision.
182
184
        self.assertEqual('rev-2', target.tags.lookup_tag('tag-a'))