From owner-freebsd-commit Wed Aug 9 22:44:12 1995 Return-Path: commit-owner Received: (from majordom@localhost) by freefall.FreeBSD.org (8.6.11/8.6.6) id WAA19200 for commit-outgoing; Wed, 9 Aug 1995 22:44:12 -0700 Received: (from majordom@localhost) by freefall.FreeBSD.org (8.6.11/8.6.6) id WAA19183 for cvs-libexec-outgoing; Wed, 9 Aug 1995 22:44:09 -0700 Received: from gndrsh.aac.dev.com (gndrsh.aac.dev.com [198.145.92.241]) by freefall.FreeBSD.org (8.6.11/8.6.6) with ESMTP id WAA19174 ; Wed, 9 Aug 1995 22:44:03 -0700 Received: (from rgrimes@localhost) by gndrsh.aac.dev.com (8.6.11/8.6.9) id WAA00793; Wed, 9 Aug 1995 22:43:59 -0700 From: "Rodney W. Grimes" Message-Id: <199508100543.WAA00793@gndrsh.aac.dev.com> Subject: Re: cvs commit: src/libexec/atrun - Imported sources To: ache@freefall.FreeBSD.org (Andrey A. Chernov) Date: Wed, 9 Aug 1995 22:43:59 -0700 (PDT) Cc: CVS-commiters@freefall.FreeBSD.org, cvs-libexec@freefall.FreeBSD.org In-Reply-To: <199508100358.UAA15496@freefall.FreeBSD.org> from "Andrey A. Chernov" at Aug 9, 95 08:58:15 pm X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Length: 877 Sender: commit-owner@FreeBSD.org Precedence: bulk > > ache 95/08/09 20:58:14 > > Branch: libexec/atrun 1.1.1 > Log: > Initial import of version 2.9 > > Status: > > Vendor Tag: koenig > Release Tags: at_2_9 > > N src/libexec/atrun/LEGAL > N src/libexec/atrun/gloadavg.h > C src/libexec/atrun/atrun.c > C src/libexec/atrun/atrun.man > N src/libexec/atrun/gloadavg.c > > 2 conflicts created by this import. > Use the following command to help the merge: > > cvs checkout -jkoenig:yesterday -jkoenig src/libexec/atrun STOP!!!! You already screwed up one area, why do you continue to work after you have already had a problem doing this that you could not handle fixing. You are not using proper tags either :-(. -- Rod Grimes rgrimes@gndrsh.aac.dev.com Accurate Automation Company Reliable computers for FreeBSD