[Python-bugs-list] PRIVATE: temporary glitch in CVS codecs.c (PR#302)

[Brian Hooper]

Oh, I figured out why this happened - I had the patch that
Marc-Andre sent earlier applied to my working directory, so
when I updated today the upstream change attempted to merge
with my working copy, which already had the same change applied.

Sorry for my confusion.

--Brian Hooper


>From: Guido van Rossum <guido@python.org>
>To: brian_takashi@hotmail.com
>CC: python-bugs-list@python.org, bugs-py@python.org
>Subject: Re: [Python-bugs-list] PRIVATE: temporary glitch in CVS codecs.c 
>(PR#302)
>Date: Fri, 21 Apr 2000 15:17:46 -0400
>
> > In the CVS tree as of this morning, the following snippet accidentally 
>got
> > checked in to CVS.
> >
> > I'm sure someone will notice this anyway soon - just wanted to send a 
>heads up.
> >
> > --Brian Hooper
> >
> >         if (func == NULL)
> >             goto onError;
> > <<<<<<< codecs.c
> >         result = PyEval_CallObject(func, args);
> > =======
> >         result = PyEval_CallObject(func, args);
> > >>>>>>> 2.3
> >         if (result == NULL)
>
>Are you sure?  I don't see this in in our CVS repository.  What does
>"cvs update codecs.c" tell you?
>
>--Guido van Rossum (home page: http://www.python.org/~guido/)

________________________________________________________________________
Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com