From owner-freebsd-hackers@FreeBSD.ORG  Fri Dec 17 14:41:22 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 7A6D116A4CF
	for <hackers@FreeBSD.org>; Fri, 17 Dec 2004 14:41:22 +0000 (GMT)
Received: from gandalf.online.bg (gandalf.online.bg [217.75.128.9])
	by mx1.FreeBSD.org (Postfix) with SMTP id AF4E243D4C
	for <hackers@FreeBSD.org>; Fri, 17 Dec 2004 14:41:20 +0000 (GMT)
	(envelope-from roam@ringlet.net)
Received: (qmail 17313 invoked from network); 17 Dec 2004 14:41:15 -0000
Received: from unknown (HELO straylight.ringlet.net) (213.16.36.84)
  by gandalf.online.bg with SMTP; 17 Dec 2004 14:41:15 -0000
Received: (qmail 3684 invoked by uid 1000); 17 Dec 2004 14:41:19 -0000
Date: Fri, 17 Dec 2004 16:41:19 +0200
From: Peter Pentchev <roam@ringlet.net>
To: Roman Kurakin <rik@cronyx.ru>
Message-ID: <20041217144119.GA1569@straylight.m.ringlet.net>
Mail-Followup-To: Roman Kurakin <rik@cronyx.ru>,
	Dag-Erling Sm?rgrav <des@des.no>,
	Dmitry Morozovsky <marck@FreeBSD.org>, hackers@FreeBSD.org,
	peter@FreeBSD.org
References: <20041216011116.P4313@woozle.rinet.ru>
	<xzpk6ridxrk.fsf@dwp.des.no> <41C1F999.2080008@cronyx.ru>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="HcAYCG3uE/tztfnV"
Content-Disposition: inline
In-Reply-To: <41C1F999.2080008@cronyx.ru>
User-Agent: Mutt/1.5.6i
cc: Dag-Erling Sm?rgrav <des@des.no>
cc: Dmitry Morozovsky <marck@FreeBSD.org>
cc: hackers@FreeBSD.org
cc: peter@FreeBSD.org
Subject: Re: 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: Fri, 17 Dec 2004 14:41:22 -0000


--HcAYCG3uE/tztfnV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Dec 17, 2004 at 12:09:45AM +0300, Roman Kurakin wrote:
> Dag-Erling Sm?rgrav:
>=20
> >Dmitry Morozovsky <marck@FreeBSD.org> writes:
> >=20
> >
> >>It seems some checks should be added to module merging code...
> >>  =20
> >>
> >
> >...or somebody should stop using the merged CVSROOT.
> >
> I suggest to add prefixes like src_cut, port_cut while merging.

As discussed on Another List, that's the way it is *supposed* to be,
at least for the ports_* prefix.  That's the way it's been for ages now -
for ports which conflict with the src tree, a 'ports_' prefix is added
to the CVSROOT module definition.  Lots of examples in the
CVSROOT-ports/modules file :)

G'luck,
Peter

--=20
Peter Pentchev	roam@ringlet.net    roam@cnsys.bg    roam@FreeBSD.org
PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
This sentence contradicts itself - or rather - well, no, actually it doesn'=
t!

--HcAYCG3uE/tztfnV
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (FreeBSD)

iD8DBQFBwvAP7Ri2jRYZRVMRAiZCAJ9NOPwQAARVMdXxonTFdDZciPmd0gCgxXiV
voycySi7/c1ezEgTNwi5Y+U=
=tugD
-----END PGP SIGNATURE-----

--HcAYCG3uE/tztfnV--