From owner-freebsd-current@FreeBSD.ORG  Mon Jul  6 11:12:39 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 2145B1065A5C;
	Mon,  6 Jul 2009 11:12:39 +0000 (UTC)
	(envelope-from rdivacky@vlk.vlakno.cz)
Received: from vlakno.cz (77-93-215-190.static.masterinter.net [77.93.215.190])
	by mx1.freebsd.org (Postfix) with ESMTP id ABAB88FC20;
	Mon,  6 Jul 2009 11:12:36 +0000 (UTC)
	(envelope-from rdivacky@vlk.vlakno.cz)
Received: from localhost (localhost [127.0.0.1])
	by vlakno.cz (Postfix) with ESMTP id 550559CB0ED;
	Mon,  6 Jul 2009 13:11:11 +0200 (CEST)
X-Virus-Scanned: amavisd-new at vlakno.cz
Received: from vlakno.cz ([127.0.0.1])
	by localhost (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id g0OExcczTefi; Mon,  6 Jul 2009 13:11:09 +0200 (CEST)
Received: from vlk.vlakno.cz (localhost [127.0.0.1])
	by vlakno.cz (Postfix) with ESMTP id 188599CB12D;
	Mon,  6 Jul 2009 13:11:09 +0200 (CEST)
Received: (from rdivacky@localhost)
	by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id n66BB7Wb019857;
	Mon, 6 Jul 2009 13:11:07 +0200 (CEST) (envelope-from rdivacky)
Date: Mon, 6 Jul 2009 13:11:07 +0200
From: Roman Divacky <rdivacky@freebsd.org>
To: Ed Schouten <ed@80386.nl>
Message-ID: <20090706111107.GA19818@freebsd.org>
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.4.2.3i
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:12:52 -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. ;-)

there's mergemaster -F