From owner-freebsd-commit Wed Aug 9 22:26:15 1995 Return-Path: commit-owner Received: (from majordom@localhost) by freefall.FreeBSD.org (8.6.11/8.6.6) id WAA18638 for commit-outgoing; Wed, 9 Aug 1995 22:26:15 -0700 Received: (from majordom@localhost) by freefall.FreeBSD.org (8.6.11/8.6.6) id WAA18624 for cvs-usrbin-outgoing; Wed, 9 Aug 1995 22:26:13 -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 WAA18616 ; Wed, 9 Aug 1995 22:26:00 -0700 Received: (from rgrimes@localhost) by gndrsh.aac.dev.com (8.6.11/8.6.9) id WAA00744; Wed, 9 Aug 1995 22:25:08 -0700 From: "Rodney W. Grimes" Message-Id: <199508100525.WAA00744@gndrsh.aac.dev.com> Subject: Re: cvs commit: src/usr.bin/at - Imported sources To: ache@astral.msk.su (=?KOI8-R?Q?=E1=CE=C4=D2=C5=CA_=FE=C5=D2=CE=CF=D7?=) Date: Wed, 9 Aug 1995 22:25:08 -0700 (PDT) Cc: CVS-commiters@freefall.FreeBSD.org, ache@freefall.FreeBSD.org, cvs-usrbin@freefall.FreeBSD.org, rgrimes@freefall.FreeBSD.org In-Reply-To: from "=?KOI8-R?Q?=E1=CE=C4=D2=C5=CA_=FE=C5=D2=CE=CF=D7?=" at Aug 10, 95 08:35:58 am X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Length: 2483 Sender: commit-owner@FreeBSD.org Precedence: bulk > > In message <199508100351.UAA15127@freefall.FreeBSD.org> Andrey A. > Chernov writes: > > >ache 95/08/09 20:50:59 > > > Branch: usr.bin/at 1.1.1 > > Log: > > Initial import of version 2.9 > > > I src/usr.bin/at/CVS This was _not_ imported, that is what the I stands for. > > > C src/usr.bin/at/Makefile > > C src/usr.bin/at/Makefile.inc > > Please, remove this 3 entries imported in by accident to > allow me continue with merging. Humm.. why didn't I get a copy of this import commit message :-(. Why are you trying to import into non vendor branched areas? And this is _not_ an ``initial import'', there is existing code there, and you probably just made a mess of it all :-(. Do not attempt to do _ANYTHING_ to this code at this time until either Peter or I have looked over the damages. Do not attempt any further imports any place in the tree. Peter, do you have the time to evaulte the damage done by this import. Here is the full body of the import message: ache 95/08/09 20:50:59 Branch: usr.bin/at 1.1.1 Log: Initial import of version 2.9 Status: Vendor Tag: koenig Release Tags: at_2_9 I src/usr.bin/at/CVS N src/usr.bin/at/LEGAL C src/usr.bin/at/Makefile C src/usr.bin/at/Makefile.inc C src/usr.bin/at/at.c C src/usr.bin/at/at.h C src/usr.bin/at/at.man C src/usr.bin/at/panic.c C src/usr.bin/at/panic.h C src/usr.bin/at/parsetime.c C src/usr.bin/at/parsetime.h C src/usr.bin/at/perm.c C src/usr.bin/at/perm.h C src/usr.bin/at/privs.h 12 conflicts created by this import. Use the following command to help the merge: cvs checkout -jkoenig:yesterday -jkoenig src/usr.bin/at A quick glance over by me shows this went in as 1.1.1.1 on all files, which is infront of all other branches. At any rate a look at the delta 1.1.1.1 for at.c shows to be a mess and I doubt further vendor imports at this point would do nothing more than create these 12 conflicts every time :-(. I have tarred up my backup copy from August 6, and have it ready to go splat right over the top of this rolling the repository backwards to that date in this area. The following shows this to be safe: freefall:rgrimes {127} cvs rdiff -D "August 5" -D "August 9 20:50" at cvs rdiff: Diffing src/usr.bin/at freefall:rgrimes {128} -- Rod Grimes rgrimes@gndrsh.aac.dev.com Accurate Automation Company Reliable computers for FreeBSD