[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    Re: [PHP-CVS] cvs: php4 /ext/mbstring mbfilter.c
From:       ssb () alltheweb ! com (Stig =?iso-8859-1?q?S=E6ther?= Bakken)
Date:       2001-08-29 20:57:24
[Download RAW message or body]

With PHP_4_0_7 checked out and standing in ext/mbstring, run:

  cvs update -j HEAD mbfilter.c

If you want to merge (join) in the difference between two specific
revisions:

  cvs update -j rev1 -j rev2 file.c

 - Stig

["Wez Furlong" <wez@thebrainroom.com>]
> Is there a one-liner CVS command line to MFH this into PHP 4_0_7?
> (I've managed to avoid working with branches in CVS so far... ;-)
> 
> --Wez.
> 
> On 28/08/01, "Wez Furlong" <wez.php@thebrainroom.com> wrote:
> > wez		Tue Aug 28 17:50:30 2001 EDT
> > 
> >   Modified files:              
> >     /php4/ext/mbstring	mbfilter.c 
> >   Log:
> >   fix uudecode
> >   
> > Index: php4/ext/mbstring/mbfilter.c
> > diff -u php4/ext/mbstring/mbfilter.c:1.14 php4/ext/mbstring/mbfilter.c:1.15
> > --- php4/ext/mbstring/mbfilter.c:1.14	Tue Aug 28 14:26:46 2001
> > +++ php4/ext/mbstring/mbfilter.c	Tue Aug 28 17:50:29 2001
> > @@ -79,7 +79,7 @@
> >   *
> >   */
> >  
> > -/* $Id: mbfilter.c,v 1.14 2001/08/28 18:26:46 wez Exp $ */
> > +/* $Id: mbfilter.c,v 1.15 2001/08/28 21:50:29 wez Exp $ */
> >  
> >  
> >  #include <stdlib.h>
> > @@ -2638,7 +2638,7 @@
> >  			break;
> >  		case uudec_state_skip_newline:
> >  			/* skip newline */
> > -			filter->status = 0;
> > +			filter->status = uudec_state_size;
> >  	}
> >  	return c;
> >  }
> 
> 
> 
> -- 
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net
> For additional commands, e-mail: php-cvs-help@lists.php.net
> To contact the list administrators, e-mail: php-list-admin@lists.php.net

-- 
  Stig Sæther Bakken <ssb@alltheweb.com>
  Fast Search & Transfer ASA, Trondheim, Norway

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net
For additional commands, e-mail: php-cvs-help@lists.php.net
To contact the list administrators, e-mail: php-list-admin@lists.php.net

[prev in list] [next in list] [prev in thread] [next in thread]