~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2006-03-01 21:16:58 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060301211658-91ae24db2df6c1d6
Updated to match new bzr diff behaviour

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
class ShelfTests(bzrlib.tests.TestCaseInTempDir):
6
6
    ORIGINAL = '\n\nhello test world\n\n'
7
7
    MODIFIED = '\n\ngoodbye test world\n\n'
8
 
    DIFF_HEADER = "=== modified file 'test_file'\n"
9
 
    DIFF_1 = """--- test_file\t
10
 
+++ test_file\t
 
8
    DIFF_HEADER = "=== modified file 'a/test_file'\n"
 
9
    DIFF_1 = """--- a/test_file\t
 
10
+++ b/test_file\t
11
11
@@ -1,4 +1,4 @@
12
12
 
13
13
 
15
15
+goodbye test world
16
16
 
17
17
"""
18
 
    DIFF_2 = """--- test_file\t
19
 
+++ test_file\t
 
18
    DIFF_2 = """--- a/test_file\t
 
19
+++ b/test_file\t
20
20
@@ -1,4 +1,4 @@
21
21
 
22
22