Make a separate checkout in an empty directory and try this:
cvs co -r PHP_4_3 php4/ext/sybase_ct/php_sybase_ct.c
On Sun, Dec 08, 2002 at 04:01:32PM +0100, Timm Friebe wrote :
> On Sun, 2002-12-08 at 10:28, Jani Taskinen wrote:
> > MFH??
> >
> > --Jani
>
> I'm sorry, I've tried the following:
>
> $ cvs update -j PHP_4_3 ext/sybase_ct/php_sybase_ct.c
> doesn't do anything, nor does:
> $ cvs update -j PHP_4_3 -j 1.74 ext/sybase_ct/php_sybase_ct.c
>
> Then again:
> $ cvs update -j 1.74 -j PHP_4_3 ext/sybase_ct/php_sybase_ct.c
> wants to remove php_sybase_ct.c
>
> cvs server: scheduling ext/sybase_ct/php_sybase_ct.c for removal
> $ cvs status -v ext/sybase_ct/php_sybase_ct.c
> ===================================================================
> File: no file php_sybase_ct.c Status: Locally Removed
>
> Working revision: -1.74
> Repository revision: 1.74
> /repository/php4/ext/sybase_ct/php_sybase_ct.c,v
> Sticky Tag: (none)
> Sticky Date: (none)
> Sticky Options: (none)
>
> OK, so this is _definitely_ not what I want.
>
> So, currently, this is what is showing (and what was showing before,
> e.g. yesterday):
> $ cvs status -v ext/sybase_ct/php_sybase_ct.c
> ===================================================================
> File: php_sybase_ct.c Status: Up-to-date
>
> Working revision: 1.74
> Repository revision: 1.74
> /repository/php4/ext/sybase_ct/php_sybase_ct.c,v
> Sticky Tag: (none)
> Sticky Date: (none)
> Sticky Options: (none)
>
> Existing Tags:
> php_4_3_0RC2 (revision: 1.73)
> php_4_3_0RC1 (revision: 1.73)
> PHP_4_3 (branch: 1.73.2)
> php_4_3_0pre2 (revision: 1.70)
> php_4_3_0pre1 (revision: 1.70)
> php_4_3_0_dev_zend2_alpha3 (revision: 1.70)
> [...shortened for brevity...]
>
> What's wrong? How does this magic "MFH" (merge from head?) work? I mean,
> I see it all the time, and have been reading
> http://www.cvshome.org/docs/manual/cvs_5.html#SEC54 for a while now, but
> don't seem to get what I have to do to make the PHP_4_3 branch contain
> the contents of HEAD (1.74).
>
> I know you're not here to support CVS lamers... maybe you can give me a
> hint, anyway?
>
> > On Sat, 7 Dec 2002, Timm Friebe wrote:
> >
> > >thekid Sat Dec 7 14:49:31 2002 EDT
> > >
> > > Modified files:
> > > /php4/ext/sybase_ct php_sybase_ct.c
> > > Log:
> > > - Fixed three memory leaks
> > > - Fixed segfault with sybase_unbuffered_query() and unfetched resultsets
> [...]
>
> --
> Timm Friebe <[EMAIL PROTECTED]>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
