From owner-freebsd-current  Sun Dec  1 00:55:50 1996
Return-Path: owner-current
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id AAA07210
          for current-outgoing; Sun, 1 Dec 1996 00:55:50 -0800 (PST)
Received: from diablo.ppp.de (diablo.ppp.de [193.141.101.34])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id AAA07205
          for <FreeBSD-current@FreeBSD.ORG>; Sun, 1 Dec 1996 00:55:48 -0800 (PST)
From: Greg Lehey <grog@lemis.de>
Received: from freebie.lemis.de by diablo.ppp.de with smtp
	(Smail3.1.28.1 #1) id m0vU7fd-000QrIC; Sun, 1 Dec 96 09:54 MET
Received: (grog@localhost) by freebie.lemis.de (8.8.3/8.6.12) 
       id JAA07710 for FreeBSD-current@FreeBSD.ORG; Sun, 1 Dec 1996 09:48:47 +0100 (MET)
Organisation: LEMIS, Schellnhausen 2, 36325 Feldatal, Germany
Phone: +49-6637-919123
Fax:   +49-6637-919122
Message-Id: <199612010848.JAA07710@freebie.lemis.de>
Subject: Corrupted CVS updates
To: FreeBSD-current@FreeBSD.ORG (FreeBSD current users)
Date: Sun, 1 Dec 1996 09:48:47 +0100 (MET)
X-Mailer: ELM [version 2.4ME+ PL28 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-current@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

I've been having the devil's own problems with ctm and cvs lately.
For some reason, cvs-cur 2741 wouldn't apply (md5 checksum error in
pci.c, couldn't force), so I spent 30 hours re-rolling my tree from
cvs-cur 380a.  Then I updated my build tree, and make world has just
died while running sys/conf/newvers.sh.  On closer examination, this
file contains:

  #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
  <<<<<<< newvers.sh
  #	$Id: newvers.sh,v 1.22 1995/11/10 21:52:59 joerg Exp $
  =======
  #	$Id: newvers.sh,v 1.29 1996/11/26 06:55:35 ache Exp $
  >>>>>>> 1.29

  TYPE="FreeBSD"

Now it definitely didn't do that a couple of days ago, and rcsdiff
shows that that's not what's in the repository, either.  Of course, my
update list has long since scrolled off the top of the screen, so I
can't check the error messages, but this happens often enough (about
every two months) to be annoying.  Where does this come from?

Greg