From owner-freebsd-current@FreeBSD.ORG  Mon Jul  6 11:14:04 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 EFB9F10658B8;
	Mon,  6 Jul 2009 11:14:03 +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 A84BB8FC20;
	Mon,  6 Jul 2009 11:14:03 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: by palm.hoeg.nl (Postfix, from userid 1000)
	id 1A0BA1CD00; Mon,  6 Jul 2009 13:14:03 +0200 (CEST)
Date: Mon, 6 Jul 2009 13:14:03 +0200
From: Ed Schouten <ed@80386.nl>
To: Roman Divacky <rdivacky@freebsd.org>
Message-ID: <20090706111403.GE48776@hoeg.nl>
References: <E1MNOcw-0001uh-K3@clue.co.za>
	<JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz+LWqlFPl5E0fc>
	<20090706110852.GD48776@hoeg.nl>
	<20090706111107.GA19818@freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="hiPWKCa83HsfYqhC"
Content-Disposition: inline
In-Reply-To: <20090706111107.GA19818@freebsd.org>
User-Agent: Mutt/1.5.19 (2009-01-05)
Cc: Ian Freislich <ianf@clue.co.za>, Eygene Ryabinkin <rea-fbsd@codelabs.ru>,
	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:14:13 -0000


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

* Roman Divacky <rdivacky@freebsd.org> wrote:
> On Mon, Jul 06, 2009 at 01:08:52PM +0200, Ed Schouten wrote:
> > Hi Eygene,
> >=20
> > * 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?
> >=20
> > 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
> there's mergemaster -F

Ooh. Thanks! I just ran `mergemaster -U' and hoped it would do the right
thing. I think it would be expected behaviour if -U implied -F...

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

--hiPWKCa83HsfYqhC
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iEYEARECAAYFAkpR3HsACgkQ52SDGA2eCwXiuwCfX8GzPnl6VZE4Tf2XOT5wOsO+
pzAAn1fKdyhSjldh7CXzZFyRFmjVH35r
=Cmfn
-----END PGP SIGNATURE-----

--hiPWKCa83HsfYqhC--