From owner-freebsd-current@FreeBSD.ORG  Mon Jul  6 11:08:54 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F40F7106568D;
	Mon,  6 Jul 2009 11:08:53 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211])
	by mx1.freebsd.org (Postfix) with ESMTP id 9455D8FC2F;
	Mon,  6 Jul 2009 11:08:53 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: by palm.hoeg.nl (Postfix, from userid 1000)
	id 096CF1CECA; Mon,  6 Jul 2009 13:08:53 +0200 (CEST)
Date: Mon, 6 Jul 2009 13:08:52 +0200
From: Ed Schouten <ed@80386.nl>
To: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Message-ID: <20090706110852.GD48776@hoeg.nl>
References: <E1MNOcw-0001uh-K3@clue.co.za>
	<JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz+LWqlFPl5E0fc>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="FVcNYgCArjuDqTR+"
Content-Disposition: inline
In-Reply-To: <JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz+LWqlFPl5E0fc>
User-Agent: Mutt/1.5.19 (2009-01-05)
Cc: Ian Freislich <ianf@clue.co.za>, current@freebsd.org, dougb@freebsd.org
Subject: Re: pebkac, but is it a mergemaster bug?
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jul 2009 11:08:54 -0000


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

Hi Eygene,

* Eygene Ryabinkin <rea-fbsd@codelabs.ru> wrote:
> Doug, I am going to implement this stuff.  May be I am overseeing
> something and there are another ways to overcome this problem?  Will
> you commit such an extension to the mergemaster?

While you're hacking on mergemaster, could you please change mergemaster
to install files when the files are exactly the same, except for the
$FreeBSD$ string? It makes switching to different CVS/SVN branches of
the FreeBSD source tree a lot harder. ;-)

--=20
 Ed Schouten <ed@80386.nl>
 WWW: http://80386.nl/

--FVcNYgCArjuDqTR+
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iEYEARECAAYFAkpR20QACgkQ52SDGA2eCwWjmACcDSHYDDCijgYYAID3sQAkGAQD
ciAAniLOynFvxSFklacHYtC6ntOjc6bA
=RbW5
-----END PGP SIGNATURE-----

--FVcNYgCArjuDqTR+--