← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.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_controldir/test_controldir.py
746
746
            source.tags.set_tag('tag-a', 'rev-2')
747
747
        except errors.TagsNotSupported:
748
748
            raise TestNotApplicable('Branch format does not support tags.')
749
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
749
        source.get_config_stack().set('branch.fetch_tags', True)
750
750
        # Now source has a tag not in its ancestry.  Sprout its controldir.
751
751
        dir = source.bzrdir
752
752
        target = dir.sprout(self.get_url('target'))
825
825
            has_ghost_tag = False
826
826
        else:
827
827
            has_ghost_tag = True
828
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
828
        source.get_config_stack().set('branch.fetch_tags', True)
829
829
        # And ask sprout for C2
830
830
        dir = source.bzrdir
831
831
        target = dir.sprout(self.get_url('target'), revision_id='rev-c2')