← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests.py

  • Committer: Michael Ellerman
  • Date: 2006-03-10 04:30:56 UTC
  • mto: (325.1.2 bzrtools) (0.3.1 shelf-dev)
  • mto: This revision was merged to the branch mainline in revision 334.
  • Revision ID: michael@ellerman.id.au-20060310043056-c3059be9260bf58a
Update for -p1 format diffs, steal some of Aaron's run_patch() from bzrtools.

Show diffs side-by-side

added added

removed removed

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