~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2015-12-17 18:39:00 UTC
  • mfrom: (6606.1.2 fix-float)
  • Revision ID: pqm@pqm.ubuntu.com-20151217183900-0719du2uv1kwu3lc
(vila) Inline testtools private method to fix an issue in xenial (the
 private implementation has changed in an backward incompatible way).
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
112
112
        repo.fetch(wt.branch.repository)
113
113
        branch2 = wt.branch.sprout(repo.bzrdir, revision_id='rev2-alt')
114
114
        self.assertEqual((2, 'rev2-alt'), branch2.last_revision_info())
115
 
        self.assertEqual(['rev1', 'rev2-alt'], branch2.revision_history())
 
115
        self.assertEqual('rev2-alt', branch2.last_revision())
116
116
 
117
117
    def test_sprout_preserves_tags(self):
118
118
        """Sprout preserves tags, even tags of absent revisions."""
179
179
 
180
180
    def test_sprout_with_ghost_in_mainline(self):
181
181
        tree = self.make_branch_and_tree('tree1')
 
182
        if not tree.branch.repository._format.supports_ghosts:
 
183
            raise tests.TestNotApplicable(
 
184
                "repository format does not support ghosts in mainline")
182
185
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
183
186
        tree.add('')
184
187
        tree.commit('msg1', rev_id='rev1')