From owner-cvs-all  Sun Jun  7 07:32:10 1998
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id HAA05151
          for cvs-all-outgoing; Sun, 7 Jun 1998 07:32:10 -0700 (PDT)
          (envelope-from owner-cvs-all@FreeBSD.ORG)
Received: from nash.pr.mcs.net (nash.pr.mcs.net [204.95.47.72])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA05130;
          Sun, 7 Jun 1998 07:32:04 -0700 (PDT)
          (envelope-from alex@nash.pr.mcs.net)
Received: (from alex@localhost)
	by nash.pr.mcs.net (8.8.8/8.8.7) id JAA06736;
	Sun, 7 Jun 1998 09:31:34 -0500 (CDT)
	(envelope-from alex)
Message-Id: <199806071431.JAA06736@nash.pr.mcs.net>
Date: Sun, 7 Jun 1998 09:31:34 -0500 (CDT)
From: Alex Nash <nash@mcs.net>
Subject: Re: cvs commit: ports/emulators/bochs Makefile ports/emulators/boch
 s/pkg         PLIST
To: dburr@FreeBSD.ORG
cc: cvs-committers@FreeBSD.ORG
In-Reply-To: <199806070932.CAA19937@freefall.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/plain; CHARSET=US-ASCII
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

On  7 Jun, Donald Burr wrote:
> dburr       1998/06/07 02:32:33 PDT
> 
>   Modified files:
>     emulators/bochs      Makefile 
>     emulators/bochs/pkg  PLIST 
>   Log:
>   Upgrade to bochs-980513a.
>   * change package name in Makefile.
>   * change md5.
>   * change PLIST to reflect changes in the installed files.
>   
>   Submitted by: Sergei Laskavy
>   (who submitted a patch to bochs-980409b; I upgraded to the latest version
>   while I was at it.)

The above commit message should have read: Fixed PLIST.

Given that the port was upgraded to 980513a 3 weeks ago (which you
didn't notice), I would guess that you:

   1. Upgraded a stale copy of the port.
   2. Checked out the port from freefall.
   3. Copied your new port on top of the results of (2).
   4. Checked in the port.

Don't do this.

This is a sure fire way to obliterate the work of others -- something
we've seen before in other parts of the system.  CVS can tell you if
there are conflicts between your commits and others, but not if you
follow the procedure above.

Alex


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