Applying a valid patch with TortoiseSvn 1.4.1 or TortoiseMerge fails [AntiVir checked]

Hi,

I have received a patch file which was created with TortoiseSVN 1.4.1
and contains the following lines:

Index: StruEdi.dpr
===================================================================
--- StruEdi.dpr (revision 85)
+++ StruEdi.dpr (working copy)
@@ -27,7 +27,6 @@
   f_FieldListFrame in 'f_FieldListFrame.pas',
   f_FieldSpecListFrame in 'f_FieldSpecListFrame.pas',
   f_FileListFrame in 'f_FileListFrame.pas',
- f_HistoryListFrame in 'f_HistoryListFrame.pas',
   f_IndexListFrame in 'f_IndexListFrame.pas',
   f_TableCommonFrame in 'f_TableCommonFrame.pas',
   f_TableGroupListFrame in 'f_TableGroupListFrame.pas',

This patch can be applies on other computers, too. Most of them work
fine.

On my local working copy I have modified StruEdi.dpr, I have added
exactly 5 new lines to the beginning of the file. This causes that the
patch must be applied on my PC at line 32, but at line 27.

I now start TortoiseMerge with the following command line: tortoisemerge
/diff:"fehler.diff" /patchpath:"D:\Entwicklung\StruEdi" /patchall

TortoiseMerge is not able to patch the file. But doing this by hand with
GNU patch works (parameter -fuzz). So I miss an option to apply the
patch with TortoiseMerge in "fuzzy mode" like GNU patch supports. I
think this is a bug.

Please note that applying the patch using the context menu of
TortoiseSVN also fails.

Regards,
Carsten Schuette

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Nov 22 16:12:57 2006