From owner-cvs-all  Fri Jan 15 04:54:10 1999
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id EAA07918
          for cvs-all-outgoing; Fri, 15 Jan 1999 04:54:10 -0800 (PST)
          (envelope-from owner-cvs-all@FreeBSD.ORG)
Received: from spinner.netplex.com.au (spinner.netplex.com.au [202.12.86.3])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA07909;
          Fri, 15 Jan 1999 04:54:05 -0800 (PST)
          (envelope-from peter@netplex.com.au)
Received: from spinner.netplex.com.au (peter@localhost [127.0.0.1])
	by spinner.netplex.com.au (8.9.1/8.9.1/Netplex) with ESMTP id UAA85699;
	Fri, 15 Jan 1999 20:52:53 +0800 (WST)
	(envelope-from peter@spinner.netplex.com.au)
Message-Id: <199901151252.UAA85699@spinner.netplex.com.au>
X-Mailer: exmh version 2.0.2 2/24/98
To: Mark Murray <markm@FreeBSD.ORG>
cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG
Subject: Re: cvs commit: src/contrib/texinfo/info signals.c terminal.c src/contrib/texinfo/makeinfo makeinfo.c src/contrib/texinfo/util install-info.c 
In-reply-to: Your message of "Fri, 15 Jan 1999 04:38:12 PST."
             <199901151238.EAA08892@freefall.freebsd.org> 
Date: Fri, 15 Jan 1999 20:52:52 +0800
From: Peter Wemm <peter@netplex.com.au>
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

Mark Murray wrote:
> markm       1999/01/15 04:38:12 PST
> 
>   Modified files:
>     contrib/texinfo/info signals.c
>   Log:
>   Break cvs merge
>   
>   Revision  Changes    Path
>   1.4       +0 -9      src/contrib/texinfo/info/signals.c

This has spammed the rest of rev 1.2, which was an intentional addition.

>   Modified files:
>     contrib/texinfo/makeinfo makeinfo.c 
>     contrib/texinfo/util install-info.c 
>   Log:
>   Fix CVS merge breakage.
>   
>   Revision  Changes    Path
>   1.6       +0 -47     src/contrib/texinfo/makeinfo/makeinfo.c

This re-broke it a few minutes after I just made it compile by completing 
xrealloc - you left the second half behind somehow.  cvs update should 
have flagged the conflict..

>   1.8       +6 -48     src/contrib/texinfo/util/install-info.c

This spammed all the freebsd modifications to this file...  The build uses 
them.

Cheers,
-Peter



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message