Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:3401 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 40753 invoked from network); 13 Jul 2003 19:32:16 -0000 Received: from unknown (HELO cmailm4.svr.pol.co.uk) (195.92.193.211) by pb1.pair.com with SMTP; 13 Jul 2003 19:32:16 -0000 Received: from modem-2428.aardvark.dialup.pol.co.uk ([217.134.9.124] helo=localhost) by cmailm4.svr.pol.co.uk with esmtp (Exim 4.14) id 19bmZy-0006UR-Up; Sun, 13 Jul 2003 20:32:15 +0100 Date: Sun, 13 Jul 2003 20:32:23 +0100 X-X-Sender: elfyn@ellixia To: Harrie Hazewinkel cc: internals@lists.php.net In-Reply-To: <35C9467E-B563-11D7-A32D-0003934A5A7E@php.net> Message-ID: References: <35C9467E-B563-11D7-A32D-0003934A5A7E@php.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: Re: [PHP-DEV] CVS banches/problems/missing patches From: elfyn@emcb.co.uk (Elfyn McBratney) On Sun, 13 Jul 2003, Harrie Hazewinkel wrote: > 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?? Yes. php-src HEAD == php5. There's also branches (see for the available release branches). > 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 Elfyn -- Elfyn McBratney, EMCB | http://www.nongnu.org/wwwauth/ http://www.emcb.co.uk | http://www.emcb.co.uk/webauth/ elfyn@emcb.co.uk | wwwauth-users AT nongnu DOT org