← 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: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

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