/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

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-02-05 20:03:29 UTC
  • mto: (3998.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3999.
  • Revision ID: nmb@wartburg.edu-20090205200329-bhneu8nhzhdgv0m0
add merge indication to the line format

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
1065
1065
        log.show_log(wt.branch, formatter)
1066
1066
        self.assertEqualDiff("""\
1067
1067
3: Jane Foo 2005-11-22 {v1.0, v1.0rc1} rev-3
1068
 
2: Joe Foo 2005-11-22 {v0.2} rev-2
 
1068
2: Joe Foo 2005-11-22 [merge] {v0.2} rev-2
1069
1069
1: Joe Foo 2005-11-22 rev-1
1070
1070
""",
1071
1071
                             logfile.getvalue())
1142
1142
        formatter = log.LineLogFormatter(to_file=logfile, levels=0)
1143
1143
        log.show_log(wt.branch, formatter)
1144
1144
        self.assertEqualDiff("""\
1145
 
2: Joe Foo 2005-11-22 rev-2
 
1145
2: Joe Foo 2005-11-22 [merge] rev-2
1146
1146
  1.1.1: Joe Foo 2005-11-22 rev-merged
1147
1147
1: Joe Foo 2005-11-22 rev-1
1148
1148
""",