Re: Commit: Re: [Fwd]: Re: Patch: Fix for Bug 1164, 2nd try


Subject: Re: Commit: Re: [Fwd]: Re: Patch: Fix for Bug 1164, 2nd try
From: Andrew Dunbar (hippietrail@yahoo.com)
Date: Tue Jun 05 2001 - 00:19:26 CDT


ha shao wrote:
>
> On Mon, Jun 04, 2001 at 10:11:27PM +0200, hfiguiere@teaser.fr wrote:
> > Committed:
> >
> > Checking in src/af/util/xp/ut_mbtowc.cpp;
> > /cvsroot/abi/src/af/util/xp/ut_mbtowc.cpp,v <-- ut_mbtowc.cpp
> > new revision: 1.19; previous revision: 1.18
> > done
>
> Somehow the commit failed:
> around 278

Looks like it had already been committed - though with different indents
or tab settings...

Andrew.

> ......................................................................
> } else {
> <<<<<<< ut_mbtowc.cpp
> if (errno==EINVAL) {
> UT_iconv_reset(cd); /* reset iconv, pointer might be messed up. */
> return 0; /* need more chars */
> }
> =======
> if (errno==EINVAL)
> {
> UT_iconv_reset(cd); /* reset iconv, pointer might be messed
> up. */
> return 0; /* need more chars */
> }
> >>>>>>> 1.19
> else {
> initialize();/*wrong seq*/
>
> --
> Best regard
> hashao

-- 
http://linguaphile.sourceforge.net

_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com




This archive was generated by hypermail 2b25 : Tue Jun 05 2001 - 00:17:41 CDT