From owner-freebsd-current@FreeBSD.ORG  Mon Jul  6 11:18:08 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 03EBD10656AC;
	Mon,  6 Jul 2009 11:18:08 +0000 (UTC) (envelope-from ianf@clue.co.za)
Received: from inbound01.jnb1.gp-online.net (inbound01.jnb1.gp-online.net
	[41.161.16.135])
	by mx1.freebsd.org (Postfix) with ESMTP id 83D848FC0C;
	Mon,  6 Jul 2009 11:18:07 +0000 (UTC) (envelope-from ianf@clue.co.za)
Received: from [41.145.103.163] (helo=clue.co.za)
	by inbound01.jnb1.gp-online.net with esmtpsa
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.63)
	(envelope-from <ianf@clue.co.za>)
	id 1MNmCy-00058z-VD; Mon, 06 Jul 2009 13:18:05 +0200
Received: from localhost ([127.0.0.1] helo=clue.co.za)
	by clue.co.za with esmtp (Exim 4.69 (FreeBSD))
	(envelope-from <ianf@clue.co.za>)
	id 1MNmCx-0001PO-Fv; Mon, 06 Jul 2009 13:18:03 +0200
To: Ed Schouten <ed@80386.nl>
From: Ian FREISLICH <ianf@clue.co.za>
In-Reply-To: <20090706110852.GD48776@hoeg.nl> 
References: <20090706110852.GD48776@hoeg.nl> <E1MNOcw-0001uh-K3@clue.co.za>
	<JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz+LWqlFPl5E0fc> 
X-Attribution: BOFH
Date: Mon, 06 Jul 2009 13:18:03 +0200
Message-Id: <E1MNmCx-0001PO-Fv@clue.co.za>
Cc: dougb@freebsd.org, Eygene Ryabinkin <rea-fbsd@codelabs.ru>,
	current@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:18:08 -0000

Ed Schouten wrote:
> * 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. ;-)

I believe that the '-F' option does this.

Ian

--
Ian Freislich