Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:3404 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 83784 invoked from network); 13 Jul 2003 23:37:15 -0000 Received: from unknown (HELO netphobia.fi) (213.243.181.8) by pb1.pair.com with SMTP; 13 Jul 2003 23:37:15 -0000 Received: from localhost (jani@localhost) by netphobia.fi (8.11.6/8.11.6) with ESMTP id h6DNbKN04744; Mon, 14 Jul 2003 02:37:20 +0300 X-Authentication-Warning: netphobia.fi: jani owned process doing -bs Date: Mon, 14 Jul 2003 02:37:20 +0300 (EEST) Sender: jani@netphobia.fi Reply-To: Jani Taskinen 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: sniper@iki.fi (Jani Taskinen) Indeed HEAD is missing some patches. Just copy PHP_4_3 ext/snmp/* to your HEAD checkout and commit them. --Jani 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?? > >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 > > > -- https://www.paypal.com/xclick/business=sniper@php.net&no_note=1&tax=0¤cy_code=EUR