From owner-freebsd-hackers@FreeBSD.ORG  Wed Dec 15 22:16:06 2004
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 255A816A4CE; Wed, 15 Dec 2004 22:16:06 +0000 (GMT)
Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 47C1243D1D; Wed, 15 Dec 2004 22:16:05 +0000 (GMT)
	(envelope-from marck@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1])
	by woozle.rinet.ru (8.13.1/8.13.1) with ESMTP id iBFMG3vi043060;
	Thu, 16 Dec 2004 01:16:03 +0300 (MSK)
	(envelope-from marck@FreeBSD.org)
Date: Thu, 16 Dec 2004 01:16:03 +0300 (MSK)
From: Dmitry Morozovsky <marck@FreeBSD.org>
X-X-Sender: marck@woozle.rinet.ru
To: peter@FreeBSD.org
Message-ID: <20041216011116.P4313@woozle.rinet.ru>
X-NCC-RegID: ru.rinet
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
cc: hackers@FreeBSD.org
Subject: duplicate CVS modules in merged CVSROOT
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Dec 2004 22:16:06 -0000

Colleagues,

in releaselog I found the following warning:

cvs checkout: duplicate key found for `cut' at line 2585 of `/FreeBSD/ncvs/CVSROOT/modules'

looking further...

marck@woozle:~/FreeBSD/CVSROOT> cvs ann modules | grep '[^a-z]cut[^a-z]'

Annotations for modules
***************
1.2          (peter    28-Feb-03): cut          src/usr.bin/cut
1.4267       (peter    15-Dec-04): cut          ports/devel/cut

It seems some checks should be added to module merging code...

Sincerely,
D.Marck                                        [DM5020, MCK-RIPE, DM3-RIPN]
---------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@FreeBSD.org ***
---------------------------------------------------------------------------