[TYPO3-dev] trouble patching trunk

[Ernesto Baschny [cron IT]]

Philipp Gampe schrieb am 04.03.2010 17:25:

> Im not that experienced in patching and co....
> 
> I tried to test RFC #13740 from core list. It applies cleanly on my
> local machine, but fails on the server.
> 
> this is what I have tried on the server:
> 
> [webseiten] svn up t3
> U    t3/ChangeLog
> U    t3/typo3/sysext/viewpage/view/index.php
> Updated to revision 7077.
> (17:14:48) [webseiten] cd t3
> (17:15:52) [t3] patch -p0 < ../13740-show-clickmenu-nosysdomain.diff
> patching file t3lib/class.t3lib_befunc.php
> Hunk #1 FAILED at 2663.
> 1 out of 1 hunk FAILED -- saving rejects to file
> t3lib/class.t3lib_befunc.php.rej
> (17:16:07) [t3]

Do a "svn info" on that directory, maybe you don't have a copy of trunk
 but some other branch?

If it is indeed trunk, it might be that you already have conflicting
patches applied to that t3lib_befunc file. Check with "svn status" and a
"svn diff" on that file.

Cheers,
Ernesto