Den mån 15 aug. 2022 kl 12:00 skrev Nelskamp-Lukas, Carsten < c.nelskamp-lu...@prosoz.de>:
> Hello, > > > > steps to reproduce the issue: > > > > Given a repository file "PARKMB.csv" with content: > > 5 > > 7 > > 9 > > [eof] > > > > and a patch file "patch.patch" with content: > > Index: PARKMB.csv > > =================================================================== > > --- PARKMB.csv (revision 203095) > > +++ PARKMB.csv (revision 203179) > > @@ -3,3 +3,9 @@ > > 7 > > 8 > > 9 > > +10 > > +11 > > +12 > > +13 > > +14 > > +15 > > [eof] > > > > The patch file is intended to apply 6 lines at the end of file > "PARKMB.csv". > > Applying the patch with "> svn patch patch.patch" leads to the following > output: > > U PARKMB.csv > > > applied hunk @@ -3,3 +3,9 @@ with offset -2 and fuzz 2 > Gmail was stupid when trying to copy your files, but I finally got it working. I can confirm the issue both on Windows (using TortoiseSVN built from Subversion /trunk as of April) and on Linux (svn, version 1.14.1 (r1886195), as supplied by the Ubuntu 22.04.1 running on WSL). I expect the file "PARKMB.csv" to contain: > > 5 > > 7 > > 9 > > 11 > > 12 > > 13 > > 14 > > 15 > > 16 > > [eof] > > > > But it contains: > > 5 > > 7 > > 9 > > 11 > > 12 > > 13 > > 14 > > *7* > > *9* > > [eof] > > > > Four lines of the patch file have been added as expected. But the last two > lines seem to have been replaced with the last to lines of the context of > the patched file (7 and 9 instead of 14 and 15). > I suspect something is wrong with the fuzzy matching. It was originally implemented under https://issues.apache.org/jira/browse/SVN-3460 but I don't have the time right now to investigate if it has been updated since. Operation System: > > Windows 10 Enterprise, Version 21H2, Build 19044.1826 > > > > SVN installed with TortoiseSVN: > > svn, version 1.14.2 (r1899510) > > compiled Apr 9 2022, 14:18:14 on x86-microsoft-windows > > > > TortoiseSVN: > > TortoiseSVN 1.14.3, Build 29387 - 64 Bit , 2022/04/08 19:31:22 > > ipv6 enabled > > Subversion 1.14.2, -release > > apr 1.6.5 > > apr-util 1.6.1 > > serf 1.3.9 > > OpenSSL 1.1.1n 15 Mar 2022 > > zlib 1.2.11 > > SQLite 3.36.0 > > > > > Thank you for considering this issue. > > > > Regards, > > Carsten Nelskamp-Lukas > Thanks for the report! Kind regards, Daniel Sahlberg
