Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:3400 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 15483 invoked from network); 13 Jul 2003 18:47:16 -0000 Received: from unknown (HELO hal-5.inet.it) (213.92.5.24) by pb1.pair.com with SMTP; 13 Jul 2003 18:47:16 -0000 Received: from [::ffff:80.180.66.154] by hal-5.inet.it via I-SMTP-4.4.4-442 id ::ffff:80.180.66.154+ChWPnu9lVVp; Sun, 13 Jul 2003 20:47:10 +0200 Date: Sun, 13 Jul 2003 20:52:53 +0200 Content-Type: text/plain; charset=US-ASCII; format=flowed Mime-Version: 1.0 (Apple Message framework v552) Cc: Harrie Hazewinkel To: internals@lists.php.net Content-Transfer-Encoding: 7bit Message-ID: <35C9467E-B563-11D7-A32D-0003934A5A7E@php.net> X-Mailer: Apple Mail (2.552) Subject: CVS banches/problems/missing patches From: harrie@php.net (Harrie Hazewinkel) 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