Date: Tue, 29 Oct 2002 13:30:24 -0800 (PST) From: Julian Elischer <julian@elischer.org> To: "David O'Brien" <obrien@FreeBSD.org> Cc: Bill Fenner <fenner@research.att.com>, cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org Subject: Re: cvs commit: src/lib/libfetch common.c Message-ID: <Pine.BSF.4.21.0210291327030.31327-100000@InterJet.elischer.org> In-Reply-To: <20021029204043.GB43281@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 29 Oct 2002, David O'Brien wrote:
> On Tue, Oct 29, 2002 at 09:58:41AM -0800, Bill Fenner wrote:
> >
> > Backing out revs 1.34 and 1.37 but leaving 1.35, 1.36 and 1.38,
> > result in a working libfetch for me. With 1.34 and 1.37 I was
> > getting core dumps in stdio while using a proxy, _fetch_read()
> > was confusing stdio. I haven't tracked it down further.
>
> Since
>
> cvs diff -kk -r 1.36 -r 1.37 common.c | patch -R
> cvs diff -kk -r 1.33 -r 1.34 common.c | patch -R
>
> results in rejects, I don't supose you've already done this and could
> work with me by sending me the file so I can maybe reduce the amount of
> additional time I spend on this to maybe just an hour?
>
try:
cvs up -kk -j 1.37 -j 1.36 common.c
cvs up -kk -j 1.35 -j 1.34 common.c
and fix the single collision
<<<<<<< common.c
total = 0;
while (iovcnt > 0) {
=======
while (len > 0) {
>>>>>>> 1.34
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0210291327030.31327-100000>