~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
    errors,
29
29
    lockdir,
30
30
    repository,
 
31
    revision as _mod_revision,
31
32
    transactions,
32
33
    transport,
33
34
    ui,
586
587
        repo.fetch(tree.branch.repository)
587
588
        self.assertTrue(repo.has_revision('1'))
588
589
        try:
589
 
            self.assertIs(dir.open_branch().last_revision(), None)
 
590
            self.assertTrue(
 
591
                _mod_revision.is_null(_mod_revision.ensure_null(
 
592
                dir.open_branch().last_revision())))
590
593
        except errors.NotBranchError:
591
594
            pass
592
595
        target = self.sproutOrSkip(dir, self.get_url('target'))