~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
 
20
20
import bzrlib
21
21
from bzrlib import (
 
22
    bzrdir,
22
23
    errors,
23
24
    lockdir,
24
25
    osutils,
740
741
        rev = tree.branch.repository.get_revision(rev_id)
741
742
        self.assertEqual('John Doe <jdoe@example.com>',
742
743
                         rev.properties['author'])
 
744
 
 
745
    def test_commit_with_checkout_and_branch_sharing_repo(self):
 
746
        repo = self.make_repository('repo', shared=True)
 
747
        # make_branch_and_tree ignores shared repos
 
748
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
749
        tree2 = branch.create_checkout('repo/tree2')
 
750
        tree2.commit('message', rev_id='rev1')
 
751
        self.assertTrue(tree2.branch.repository.has_revision('rev1'))