← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
692
692
        self.build_tree(['a'])
693
693
        wt.add('a')
694
694
        b.nick = 'test-line-log'
695
 
        wt.commit(message='add a', 
696
 
                  timestamp=1132711707, 
 
695
        wt.commit(message='add a',
 
696
                  timestamp=1132711707,
697
697
                  timezone=36000,
698
698
                  committer='Line-Log-Formatter Tester <test@line.log>')
699
699
        logfile = file('out.tmp', 'w+')