Patch reject problems

[lynx . abraxas]

Hallo!


I'm using diff and patch to try to merge branch back to trunk from ctp2. 
I got patch to do quiet a good job but it often has rjects with just one line 
changed and some offset. Why does it have problems there? Is there a way to 
help patch there with different diffs? Example below.

Thanks
Lynx

diffs from:

for i in "*.h" "*.[hc]pp"; do ls $i 2> /dev/null ; find ctp2_code/ -name $i 
-exec diff -awN -u -I '^[ ]*$' ../ctp2_clone/{} {} >> merge11.diff \;; done

one reject file:

cat -A ctp2_code/ui/netshell/serverselectwindow.cpp.rej
***************$
*** 1,13 ****$
- $
- $
- $
- $
- $
- $
- $
- $
- $
- $
$
#include "c3.h"$
$
--- 1,32 ----$
+ 
//----------------------------------------------------------------------------$
+ //$
+ // Project : Call To Power 2$
+ // File type : C++ source$
+ // Description : Multiplayer server select window$
+ // Id : $Id: serverselectwindow.cpp 720 2007-04-12 14:24:53Z lynx $$
+ //$
+ 
//----------------------------------------------------------------------------$
+ //$
+ // Disclaimer$
+ //$
+ // THIS FILE IS NOT GENERATED OR SUPPORTED BY ACTIVISION.$
+ //$
+ // This material has been developed at apolyton.net by the Apolyton CtP2 $
+ // Source Code Project. Contact the authors at address@hidden
+ //$
+ 
//----------------------------------------------------------------------------$
+ //$
+ // Compiler flags$
+ //$
+ // - None$
+ //$
+ 
//----------------------------------------------------------------------------$
+ //$
+ // Modifications from the original Activision code:$
+ //$
+ // - Initialized local variables. (Sep 9th 2005 Martin GM-|hmann)$
+ //$
+ 
//----------------------------------------------------------------------------$
$
#include "c3.h"$
$
***************$
*** 78,88 ****$
}$
$
$
- $
AUI_ERRCODE ServerSelectWindow::CreateControls( void )$
{$
- ^IAUI_ERRCODE errcode;$
- $
$
^I$
$
--- 90,98 ----$
}$
$
$
AUI_ERRCODE ServerSelectWindow::CreateControls( void )$
{$
+ ^IAUI_ERRCODE errcode = AUI_ERRCODE_OK;$
$
^I$
$
***************$
*** 233,239 ****$
^Idp_objectDelta_packet_t *p;$
^I$
^Iif(g_netfunc) {$
- ^I^Iwhile(m = g_netfunc->GetMessage()) {$
^I^I^I$
^I^I^I$
^I^I^I$
--- 209,215 ----$
^Idp_objectDelta_packet_t *p;$
^I$
^Iif(g_netfunc) {$
+ ^I^Iwhile((m = g_netfunc->GetMessage())) {$
^I^I^I$
^I^I^I$
^I^I^I$

Does anybody see, why patch has problems here? Any suggestions what could 
reduce the amount of reject further?