Schuette, Carsten wrote:
> 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
Do you start TortoiseMerge manually? Why?
> 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.
TortoiseMerge doesn't have a fuzzy mode. And it never will have, sorry.
TortoiseMerge is designed to work with Subversion working copies. And if
a file doesn't match the patchfile exactly, TortoiseMerge tries to fetch
the file from the repository without the modifications. Seems you try to
apply a patch to a folder which isn't under version control, then TMerge
can't fetch the required file and the patching will fail.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Nov 24 17:14:09 2006