← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_sprout.py
124
124
        source = builder.get_branch()
125
125
        try:
126
126
            source.tags.set_tag('tag-a', 'missing-rev')
127
 
        except errors.TagsNotSupported:
 
127
        except (errors.TagsNotSupported, errors.GhostTagsNotSupported):
128
128
            raise tests.TestNotApplicable(
129
 
                'Branch format does not support tags.')
 
129
                'Branch format does not support tags or tags to ghosts.')
130
130
        # Now source has a tag pointing to an absent revision.  Sprout it.
131
131
        target_bzrdir = self.make_repository('target').bzrdir
132
132
        new_branch = source.sprout(target_bzrdir)