Re: problems applying patches created by tortoiseSVN in linux

Hi all

> It is a known bug that if patches contain lines with svn keywords in them
> the patches generated won't apply with patch. Issue #2164, but that
> should not be every patch, though it may explain a number of them.

Here's an example of patch created in windows with TortoiseSVN that will not
apply in linux:

http://trac.seagullproject.org/attachment/ticket/193/patch.diff

Output:

[demian@localhost trunk]$ patch -p0 --dry-run < patch.diff
(Stripping trailing CRs from patch.)
patching file modules/navigation/classes/CategoryMgr.php
Hunk #1 FAILED at 59.
Hunk #2 FAILED at 83.
Hunk #3 FAILED at 96.
Hunk #4 FAILED at 308.
Hunk #5 FAILED at 325.
Hunk #6 FAILED at 363.
6 out of 6 hunks FAILED -- saving rejects to file
modules/navigation/classes/CategoryMgr.php.rej

I also tried this with a -u switch as suggested earlier, same outcome. You can
recreate this scenario by checking out the above repo at rev 752 from here:

http://svn.seagullproject.org/svn/seagull/trunk/

and trying to apply the patch. The patch applies fine in widows using the
TortoiseSVN right-click 'apply patch'.

Any feeback would be most appreciated.

cheers

Demian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 16 17:26:13 2005