On Thu, Feb 04, 2010 at 10:53:26PM +0100, Stefan Sperling wrote:
> On Thu, Feb 04, 2010 at 08:11:00PM +0100, Daniel Näslund wrote:
> Can you explain why?
We have changed a part of the hunk parsing logic to only check for fuzz
at start and end of a hunk. It should not take intermediate context into
account.
> + "@@ -7,7 +8,9 @@\n",
> " and 50,000,000 individual email addresses from all over the world.\n",
> " \n",
> " Your email address drew and have won the sum of 750,000 Euros\n",
> "+Another new line\n",
> " ( Seven Hundred and Fifty Thousand Euros) in cash credited to\n",
> + "+A third new line\n",
> " file with\n",
> " REFERENCE NUMBER: ESP/WIN/008/05/10/MA;\n",
> + " WINNING NUMBER : 14-17-24-34-37-45-16\n",
> Is the indentation of the above line off on purpose?
The extra space was a typo when I created the test. Fixed it at the same
time.
New log message which is ridiciously long for such a small change.
Feedback on it is welcome:
[[[
For determining fuzz we have an algorithm that should only check for
trailing and leading context. Add a small regression test to existing
testcase. At the same time fix small typo.
* subversion/tests/cmdline/patch_tests.py
(patch_with_fuzz): Add context in the middle of one of the fuzzy
hunks.
Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
]]]
Index: subversion/tests/cmdline/patch_tests.py
===================================================================
--- subversion/tests/cmdline/patch_tests.py (revision 907025)
+++ subversion/tests/cmdline/patch_tests.py (arbetskopia)
@@ -1105,19 +1105,21 @@
" Balloting. This is a Millennium Scientific Electronic Computer Draw\n",
" in which email addresses were used. All participants were selected\n",
" through a computer ballot system drawn from over 100,000 company\n",
- "@@ -7,6 +8,7 @@\n",
+ "@@ -7,7 +8,9 @@\n",
" and 50,000,000 individual email addresses from all over the world.\n",
" \n",
" Your email address drew and have won the sum of 750,000 Euros\n",
"+Another new line\n",
" ( Seven Hundred and Fifty Thousand Euros) in cash credited to\n",
+ "+A third new line\n",
" file with\n",
- " REFERENCE NUMBER: ESP/WIN/008/05/10/MA;\n",
+ " REFERENCE NUMBER: ESP/WIN/008/05/10/MA;\n",
+ " WINNING NUMBER : 14-17-24-34-37-45-16\n",
"@@ -19,6 +20,7 @@\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",
- "+A third new line\n",
+ "+A fourth new line\n",
" \n",
" Again, we wish to congratulate you over your email success in our\n"
" computer Balloting. [No trailing newline here]"
@@ -1138,6 +1140,7 @@
"Your email address drew and have won the sum of 750,000 Euros\n",
"Another new line\n",
"( Seven Hundred and Fifty Thousand Euros) in cash credited to\n",
+ "A third new line\n",
"file with\n",
" REFERENCE NUMBER: ESP/WIN/008/05/10/MA;\n",
" WINNING NUMBER : 14-17-24-34-37-45-16\n",
@@ -1150,7 +1153,7 @@
"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",
- "A third new line\n",
+ "A fourth new line\n",
"\n",
"Line replaced for fuzz = 2\n",
"Line replaced for fuzz = 2\n",
@@ -1159,7 +1162,7 @@
expected_output = [
'U %s\n' % os.path.join(wc_dir, 'A', 'mu'),
'> applied hunk @@ -1,6 +1,7 @@ with fuzz 1\n',
- '> applied hunk @@ -7,6 +8,7 @@ with fuzz 2\n',
+ '> applied hunk @@ -7,7 +8,9 @@ with fuzz 2\n',
'> applied hunk @@ -19,6 +20,7 @@ with offset 1 and fuzz 2\n',
]
expected_disk = svntest.main.greek_state.copy()
