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

  • Committer: Martin Pool
  • Date: 2006-05-04 06:07:43 UTC
  • mto: This revision was merged to the branch mainline in revision 1699.
  • Revision ID: mbp@sourcefrog.net-20060504060743-cdcb40c14eb62d10
When a diff prefix is given, don't show it in === summary lines, only on the diffs themselves.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
57
57
        out, err = self.runbzr('diff --prefix old/:new/', retcode=1)
58
58
        self.assertEquals(err, '')
59
59
        self.assertEqualDiff(out, '''\
60
 
=== modified file 'old/hello'
 
60
=== modified file 'hello'
61
61
--- old/hello\t
62
62
+++ new/hello\t
63
63
@@ -1,1 +1,1 @@
73
73
        out, err = self.runbzr('diff -p1', retcode=1)
74
74
        self.assertEquals(err, '')
75
75
        self.assertEqualDiff(out, '''\
76
 
=== modified file 'old/hello'
 
76
=== modified file 'hello'
77
77
--- old/hello\t
78
78
+++ new/hello\t
79
79
@@ -1,1 +1,1 @@