← 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: 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_controldir/test_controldir.py
690
690
            source.tags.set_tag('tag-a', 'rev-2')
691
691
        except errors.TagsNotSupported:
692
692
            raise TestNotApplicable('Branch format does not support tags.')
 
693
        source.get_config().set_user_option('branch.fetch_tags', 'True')
693
694
        # Now source has a tag not in its ancestry.  Sprout its controldir.
694
695
        dir = source.bzrdir
695
696
        target = dir.sprout(self.get_url('target'))
761
762
            source.tags.set_tag('tag-absent', 'absent-rev')
762
763
        except errors.TagsNotSupported:
763
764
            raise TestNotApplicable('Branch format does not support tags.')
 
765
        source.get_config().set_user_option('branch.fetch_tags', 'True')
764
766
        # And ask sprout for C2
765
767
        dir = source.bzrdir
766
768
        target = dir.sprout(self.get_url('target'), revision_id='rev-c2')