← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

  • Committer: Martin Pool
  • Date: 2009-07-10 06:46:10 UTC
  • mto: (4525.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4526.
  • Revision ID: mbp@sourcefrog.net-20090710064610-sqviksbqp5i34sw2
Rename to per_interrepository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
182
182
        builder.build_snapshot('rev-1', None, [
183
183
            ('add', ('', 'root-id', 'directory', None)),
184
184
            ('add', ('a', 'a-id', 'file', 'first\n')),
185
 
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com")
 
185
            ], timestamp=1166046000.00, committer="joe@foo.com")
186
186
        builder.build_snapshot('rev-2', ['rev-1'], [
187
187
            ('modify', ('a-id', 'first\nsecond\n')),
188
 
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com")
 
188
            ], timestamp=1166046001.00, committer="joe@foo.com")
189
189
        builder.build_snapshot('rev-1_1_1', ['rev-1'], [
190
190
            ('modify', ('a-id', 'first\nthird\n')),
191
 
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com")
 
191
            ], timestamp=1166046002.00, committer="barry@foo.com")
192
192
        builder.build_snapshot('rev-3', ['rev-2', 'rev-1_1_1'], [
193
193
            ('modify', ('a-id', 'first\nsecond\nthird\n')),
194
 
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com")
 
194
            ], timestamp=1166046003.00, committer="sal@foo.com")
195
195
        return builder
196
196
 
197
197
    def create_deeply_merged_trees(self):
222
222
        builder.build_snapshot('rev-4', ['rev-3', 'rev-1_1_2'], [])
223
223
        builder.build_snapshot('rev-1_2_1', ['rev-1_1_1'], [
224
224
            ('modify', ('a-id', 'first\nthird\nfourth\n')),
225
 
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com")
 
225
            ], timestamp=1166046003.00, committer="jerry@foo.com")
226
226
        builder.build_snapshot('rev-1_2_2', ['rev-1_2_1'], [],
227
 
            timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
 
227
            timestamp=1166046004.00, committer="jerry@foo.com")
228
228
        builder.build_snapshot('rev-5', ['rev-4', 'rev-1_2_2'], [
229
229
            ('modify', ('a-id', 'first\nsecond\nthird\nfourth\n')),
230
 
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
 
230
            ], timestamp=1166046004.00, committer="jerry@foo.com")
231
231
        builder.build_snapshot('rev-1_3_1', ['rev-1_2_1'], [
232
232
            ('modify', ('a-id', 'first\nthird\nfourth\nfifth\nsixth\n')),
233
 
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com")
 
233
            ], timestamp=1166046005.00, committer="george@foo.com")
234
234
        builder.build_snapshot('rev-6', ['rev-5', 'rev-1_3_1'], [
235
235
            ('modify', ('a-id',
236
236
                        'first\nsecond\nthird\nfourth\nfifth\nsixth\n')),