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?= <ache@nagual.ru> To: Garrett Wollman <wollman@lcs.mit.edu> 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 Message-ID: <Pine.BSF.3.95.970103204019.451A-100000@nagual.ru> In-Reply-To: <9701031548.AA02741@halloran-eldar.lcs.mit.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 3 Jan 1997, Garrett Wollman wrote: > <<On Fri, 3 Jan 1997 00:29:48 -0800 (PST), "Andrey A. Chernov" <ache@freefall.freebsd.org> 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 <ache@null.net> http://www.nagual.ru/~ache/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.3.95.970103204019.451A-100000>