/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-09-29 15:50:58 UTC
  • mfrom: (6177 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6178.
  • Revision ID: v.ladeuil+lp@free.fr-20110929155058-zgbecmx1huzktegm
Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_sprout.py
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."""