/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 breezy/tests/test_log.py

merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_log.py
29
29
    )
30
30
from ..sixish import (
31
31
    BytesIO,
 
32
    unichr,
32
33
    )
33
34
 
34
35
 
302
303
        merger.commit('merged trunk into merger')           # 1.2.1
303
304
        # Commits are processed in increments of 200 revisions, so
304
305
        # make sure the two merges into trunk are in different chunks.
305
 
        for i in xrange(200):
 
306
        for i in range(200):
306
307
            trunk.commit('intermediate commit %d' % i)      # 3-202
307
308
        trunk.merge_from_branch(merger.branch)
308
309
        trunk.commit('merged merger into trunk')            # 203