/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/blackbox/test_commit.py

  • Committer: Aaron Bentley
  • Date: 2009-03-09 02:16:29 UTC
  • mfrom: (4090 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4100.
  • Revision ID: aaron@aaronbentley.com-20090309021629-o4j18ltv1hzuuyhl
Merge bzr.dev into clean-tree2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
302
302
    def test_commit_a_text_merge_in_a_checkout(self):
303
303
        # checkouts perform multiple actions in a transaction across bond
304
304
        # branches and their master, and have been observed to fail in the
305
 
        # past. This is a user story reported to fail in bug #43959 where 
 
305
        # past. This is a user story reported to fail in bug #43959 where
306
306
        # a merge done in a checkout (using the update command) failed to
307
307
        # commit correctly.
308
308
        trunk = self.make_branch_and_tree('trunk')
554
554
                     "tree/hello.txt"])
555
555
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
556
556
        properties = last_rev.properties
557
 
        self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['author'])
 
557
        self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['authors'])
558
558
 
559
559
    def test_author_no_email(self):
560
560
        """Author's name without an email address is allowed, too."""
565
565
                                "tree/hello.txt")
566
566
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
567
567
        properties = last_rev.properties
568
 
        self.assertEqual('John Doe', properties['author'])
 
568
        self.assertEqual('John Doe', properties['authors'])
 
569
 
 
570
    def test_multiple_authors(self):
 
571
        """Multiple authors can be specyfied, and all are stored."""
 
572
        tree = self.make_branch_and_tree('tree')
 
573
        self.build_tree(['tree/hello.txt'])
 
574
        tree.add('hello.txt')
 
575
        out, err = self.run_bzr("commit -m hello --author='John Doe' "
 
576
                                "--author='Jane Rey' tree/hello.txt")
 
577
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
 
578
        properties = last_rev.properties
 
579
        self.assertEqual('John Doe\nJane Rey', properties['authors'])
569
580
 
570
581
    def test_partial_commit_with_renames_in_tree(self):
571
582
        # this test illustrates bug #140419