[TYPO3-core] RFC: Fix Bug #4832 - Patch for ter_update_check into EM

Helmut Hummel typo3 at rampenlicht.org
Mon Oct 29 11:34:12 CET 2007


Steffen Kamper schrieb:
> "Dmitry Dulepov [typo3]" <dmitry at typo3.org> schrieb im Newsbeitrag 
> news:mailman.1.1193649090.5973.typo3-team-core at lists.netfielders.de...
>>
>> /Projects/TYPO3/TYPO3-HEAD>patch -p0 --dry-run < 
>> /tmp/20071028_ter_update_check.patch
>> patching file typo3/mod/tools/em/class.em_index.php
[...]
>> 5 out of 5 hunks FAILED -- saving rejects to file 
> 
> strange, i could apply to trunk without errors.

I think CRs (DOS line endings) are the problem here again:

# patch -p0 --dry-run < 20071028_ter_update_check.patch
(Stripping trailing CRs from patch.)
[...]

My version of patch is stripping them automatically, the version of
Dmitry obviosly not. We should send patches only with unix file endings.

To avoid such things in future, all php files in repository should have
the "eol-style: LF" property set...

Just to make sure, I attached the last patch from christian with CRs
stripped. Can you test if this patch applies correctly Dmitry?

Regards Helmut
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 20071028_ter_update_check.patch
Url: http://lists.netfielders.de/pipermail/typo3-team-core/attachments/20071029/e519ff8a/attachment.txt 


More information about the TYPO3-team-core mailing list