From owner-freebsd-current@FreeBSD.ORG  Mon Jul  6 11:38:32 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 852B51065687
	for <current@freebsd.org>; Mon,  6 Jul 2009 11:38:32 +0000 (UTC)
	(envelope-from erikt@midgard.homeip.net)
Received: from ch-smtp02.sth.basefarm.net (ch-smtp02.sth.basefarm.net
	[80.76.149.213])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D64C8FC19
	for <current@freebsd.org>; Mon,  6 Jul 2009 11:38:32 +0000 (UTC)
	(envelope-from erikt@midgard.homeip.net)
Received: from c83-255-48-78.bredband.comhem.se ([83.255.48.78]:50110
	helo=falcon.midgard.homeip.net)
	by ch-smtp02.sth.basefarm.net with esmtp (Exim 4.69)
	(envelope-from <erikt@midgard.homeip.net>) id 1MNmGW-0008HA-8A
	for current@freebsd.org; Mon, 06 Jul 2009 13:21:44 +0200
Received: (qmail 93301 invoked from network); 6 Jul 2009 13:15:01 +0200
Received: from owl.midgard.homeip.net (10.1.5.7)
	by falcon.midgard.homeip.net with ESMTP; 6 Jul 2009 13:15:01 +0200
Received: (qmail 60021 invoked by uid 1001); 6 Jul 2009 13:15:01 +0200
Date: Mon, 6 Jul 2009 13:15:01 +0200
From: Erik Trulsson <ertr1013@student.uu.se>
To: Ed Schouten <ed@80386.nl>
Message-ID: <20090706111501.GA59991@owl.midgard.homeip.net>
References: <E1MNOcw-0001uh-K3@clue.co.za>
	<JihCfvLYurSbwCvYPMTikKEUsuo@OeoW5JVkL3r5Dz+LWqlFPl5E0fc>
	<20090706110852.GD48776@hoeg.nl>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20090706110852.GD48776@hoeg.nl>
User-Agent: Mutt/1.5.20 (2009-06-14)
X-Originating-IP: 83.255.48.78
X-Scan-Result: No virus found in message 1MNmGW-0008HA-8A.
X-Scan-Signature: ch-smtp02.sth.basefarm.net 1MNmGW-0008HA-8A
	f1469babca4feae03296d726a5022538
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:38:32 -0000

On Mon, Jul 06, 2009 at 01:08:52PM +0200, Ed Schouten wrote:
> 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. ;-)

Isn't that exactly what the '-F' flag for mergemaster already does?



-- 
<Insert your favourite quote here.>
Erik Trulsson
ertr1013@student.uu.se