Hi!

[[[

* subversion/tests/cmdline/patch_tests.py
  (patch_with_fuzz): Add a test for applying a hunk with offset and fuzz
    to this testcase.

Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
]]]
Index: subversion/tests/cmdline/patch_tests.py
===================================================================
--- subversion/tests/cmdline/patch_tests.py	(revision 905716)
+++ subversion/tests/cmdline/patch_tests.py	(arbetskopia)
@@ -1059,6 +1059,7 @@
     "    SERIAL NUMBER: 45327\n",
     "and PROMOTION DATE: 13th June. 2009\n",
     "\n",
+    "This line is inserted to cause an offset of +1\n",
     "To claim your winning prize, you are to contact the appointed\n",
     "agent below as soon as possible for the immediate release of your\n",
     "winnings with the below details.\n",
@@ -1131,6 +1132,7 @@
     "    SERIAL NUMBER: 45327\n",
     "and PROMOTION DATE: 13th June. 2009\n",
     "\n",
+    "This line is inserted to cause an offset of +1\n",
     "To claim your winning prize, you are to contact the appointed\n",
     "agent below as soon as possible for the immediate release of your\n",
     "winnings with the below details.\n",
@@ -1142,6 +1144,7 @@
 
   expected_output = [
     'U         %s\n' % os.path.join(wc_dir, 'A', 'mu'),
+    '>         applied hunk @@ -19,6 +20,7 @@ with offset 1\n',
   ]
   expected_disk = svntest.main.greek_state.copy()
   expected_disk.tweak('A/mu', contents=''.join(mu_contents))

Reply via email to