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

merge bzr.dev r4054

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
600
600
      +++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
601
601
      @@ -0,0 +1,1 @@
602
602
      +contents of parent/file1
603
 
      
 
603
\x20\x20\x20\x20\x20\x20
604
604
      === added file 'file2'
605
605
      --- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
606
606
      +++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
616
616
        log = normalize_log(out)
617
617
        # Not supported by this formatter so expect plain output
618
618
        self.assertEqualDiff(subst_dates(log), """\
619
 
2: Lorem Ipsum 2005-11-22 merge branch 1
 
619
2: Lorem Ipsum 2005-11-22 [merge] merge branch 1
620
620
1: Lorem Ipsum 2005-11-22 first post
621
621
""")
622
622