CVS banches/problems/missing patches

HI, After the last confusion I had with PHP and which branches, I am am confused again. But correct my if I am wrong, but now I have to use "cvs co php-src" in order to get the main branch, right?? This I need to use for development, right?? If so, it looks to me there are missing patches/updates. I have applied some patches/updates (which are below only the diff header is printed) and I do not seem to find those anymore in the CVS log and neither a cvs diff -r1.78 snmp.c recognises the version. What happened?? Did someone copied old ,v files over existing ones?? And I just correct it by applying the patches AGAIN?? Index: php4/ext/snmp/php_snmp.h diff -u php4/ext/snmp/php_snmp.h:1.18 php4/ext/snmp/php_snmp.h:1.19 --- php4/ext/snmp/php_snmp.h:1.18 Tue Jun 10 16:03:36 2003 +++ php4/ext/snmp/php_snmp.h Mon Jun 23 14:02:03 2003 diff -u php4/ext/snmp/snmp.c:1.77 php4/ext/snmp/snmp.c:1.78 --- php4/ext/snmp/snmp.c:1.77 Tue Jun 10 16:03:36 2003 +++ php4/ext/snmp/snmp.c Mon Jun 23 14:02:03 2003 Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.78 php4/ext/snmp/snmp.c:1.79 --- php4/ext/snmp/snmp.c:1.78 Mon Jun 23 14:02:03 2003 +++ php4/ext/snmp/snmp.c Mon Jun 23 14:16:37 2003 regards and thanks in advance for your help, Harrie