/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/test_annotate.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/test_annotate.py
475
475
        tree1.add(['b'], ['b-id'])
476
476
        tree1.commit('b', rev_id='rev-2',
477
477
                     committer='Committer <committer@example.com>',
478
 
                     author='Author <author@example.com>',
 
478
                     authors=['Author <author@example.com>'],
479
479
                     timestamp=1166046000.00, timezone=0)
480
480
 
481
481
        tree1.lock_read()
502
502
    def test_reannotate(self):
503
503
        self.annotateEqual(parent_1, [parent_1], new_1, 'blahblah')
504
504
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
505
 
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2, 
 
505
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2,
506
506
                           'blahblah')
507
507
 
508
508
    def test_reannotate_no_parents(self):