/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: Ian Clatworthy
  • Date: 2009-03-27 01:53:11 UTC
  • mto: (4213.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 4214.
  • Revision ID: ian.clatworthy@canonical.com-20090327015311-2pjd7s0yqebuf9sb
merge indicators in log --long

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
541
541
        the_log = normalize_log(sio.getvalue())
542
542
        self.assertEqualDiff("""\
543
543
------------------------------------------------------------
544
 
revno: 2
 
544
revno: 2 [merge]
545
545
committer: Lorem Ipsum <test@example.com>
546
546
branch nick: parent
547
547
timestamp: Just now
548
548
message:
549
549
  merge branch 1
550
550
    ------------------------------------------------------------
551
 
    revno: 1.1.2
 
551
    revno: 1.1.2 [merge]
552
552
    committer: Lorem Ipsum <test@example.com>
553
553
    branch nick: child
554
554
    timestamp: Just now
598
598
        the_log = normalize_log(sio.getvalue())
599
599
        self.assertEqualDiff("""\
600
600
------------------------------------------------------------
601
 
revno: 2
 
601
revno: 2 [merge]
602
602
committer: Lorem Ipsum <test@example.com>
603
603
branch nick: parent
604
604
timestamp: Just now
890
890
        the_log = normalize_log(sio.getvalue())
891
891
        self.assertEqualDiff("""\
892
892
------------------------------------------------------------
893
 
revno: 2
 
893
revno: 2 [merge]
894
894
committer: Lorem Ipsum <test@example.com>
895
895
branch nick: parent
896
896
timestamp: Just now
910
910
added:
911
911
  f1
912
912
  f2
 
913
------------------------------------------------------------
 
914
Use -n0 to see merged revisions.
913
915
""",
914
916
                             the_log)
915
917