From owner-cvs-sbin Fri Jan 3 09:57:18 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id JAA04849 for cvs-sbin-outgoing; Fri, 3 Jan 1997 09:57:18 -0800 (PST) Received: from sovcom.kiae.su (sovcom.kiae.su [193.125.152.1]) by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id JAA04842; Fri, 3 Jan 1997 09:57:13 -0800 (PST) Received: by sovcom.kiae.su id AA06912 (5.65.kiae-1 ); Fri, 3 Jan 1997 20:52:48 +0300 Received: by sovcom.KIAE.su (UUMAIL/2.0); Fri, 3 Jan 97 20:52:48 +0300 Received: from localhost (nagual.ru [127.0.0.1]) by nagual.ru (8.8.4/8.8.4) with SMTP id UAA00465; Fri, 3 Jan 1997 20:49:20 +0300 (MSK) Date: Fri, 3 Jan 1997 20:49:19 +0300 (MSK) From: =?KOI8-R?Q?=E1=CE=C4=D2=C5=CA_=FE=C5=D2=CE=CF=D7_=2F_Andrey_Chern?= =?KOI8-R?Q?ov?= To: Garrett Wollman Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-sbin@freefall.freebsd.org, peter@freebsd.org Subject: Re: cvs commit: src/sbin/routed input.c In-Reply-To: <9701031548.AA02741@halloran-eldar.lcs.mit.edu> Message-Id: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-sbin@freebsd.org X-Loop: FreeBSD.org Precedence: bulk On Fri, 3 Jan 1997, Garrett Wollman wrote: > < said: > > > ache 97/01/03 00:29:47 > > Modified: sbin/routed input.c > > Log: > > Merge to eliminate conflict > > Andrey, there wasn't anything to merge! There was 1 conflict, which import message suggest to merge, check commit archive. Unfortunately it was $Rrevision$ conflict. Now (after merge), we don't have conflict because merged version is later than imported one, but will have it on the next update again due to mismatched $Revisions$. What is current policy with 3rd party $RCS$ tags? I prefer to keep them as they originally was, so "cvs co adm -ko" is needed which not allowed for normal cvs user (I try it) for unknown reason (Peter, could you enable it again, please?) Right now routed overwrites native $Revisions$ with its own ones which isn't good. -- Andrey A. Chernov http://www.nagual.ru/~ache/