/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_log.py

merge bzr.dev r4029

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
1100
1100
        log.show_log(wt.branch, formatter)
1101
1101
        self.assertEqualDiff("""\
1102
1102
3: Jane Foo 2005-11-22 {v1.0, v1.0rc1} rev-3
1103
 
2: Joe Foo 2005-11-22 {v0.2} rev-2
 
1103
2: Joe Foo 2005-11-22 [merge] {v0.2} rev-2
1104
1104
1: Joe Foo 2005-11-22 rev-1
1105
1105
""",
1106
1106
                             logfile.getvalue())
1177
1177
        formatter = log.LineLogFormatter(to_file=logfile, levels=0)
1178
1178
        log.show_log(wt.branch, formatter)
1179
1179
        self.assertEqualDiff("""\
1180
 
2: Joe Foo 2005-11-22 rev-2
 
1180
2: Joe Foo 2005-11-22 [merge] rev-2
1181
1181
  1.1.1: Joe Foo 2005-11-22 rev-merged
1182
1182
1: Joe Foo 2005-11-22 rev-1
1183
1183
""",