From owner-freebsd-current@FreeBSD.ORG  Mon Jul  6 11:31: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 49531106566C;
	Mon,  6 Jul 2009 11:31:08 +0000 (UTC)
	(envelope-from rea-fbsd@codelabs.ru)
Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.177.45])
	by mx1.freebsd.org (Postfix) with ESMTP id E99ED8FC14;
	Mon,  6 Jul 2009 11:31:07 +0000 (UTC)
	(envelope-from rea-fbsd@codelabs.ru)
DomainKey-Signature: a=rsa-sha1; q=dns; c=simple; s=one; d=codelabs.ru;
	h=Received:Date:From:To:Cc:Subject:Message-ID:Reply-To:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:Sender;
	b=JZkyKKjTQPA7nvyOy+uZJ2+wGg4HMxfyI3HycQNJoIR3GQdctgvz50ACyb5qeBIBsIvMMWIeGF14Y/CuLpCp1HdNM9GEMfhxcW81AjdeOp+asZAG2d3HzLBWTY0xSc/uImjP8FKQJmdfe29KaDEaDrYJFIN9GmmeKW8dNBk6ubc=;
Received: from void.codelabs.ru (void.codelabs.ru [144.206.177.25])
	by 0.mx.codelabs.ru with esmtpsa (TLSv1:AES256-SHA:256)
	id 1MNmPa-000HB7-Ct; Mon, 06 Jul 2009 15:31:06 +0400
Date: Mon, 6 Jul 2009 15:31:04 +0400
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
To: Ed Schouten <ed@80386.nl>
Message-ID: <edKea2AEcfqDw8zYRtbIKcL4VB8@OeoW5JVkL3r5Dz+LWqlFPl5E0fc>
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>
Sender: rea-fbsd@codelabs.ru
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
Reply-To: rea-fbsd@codelabs.ru
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:31:08 -0000

Ed, good day.

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

It's 'mergemaster -F'.
-- 
Eygene
 _                ___       _.--.   #
 \`.|\..----...-'`   `-._.-'_.-'`   #  Remember that it is hard
 /  ' `         ,       __.--'      #  to read the on-line manual
 )/' _/     \   `-_,   /            #  while single-stepping the kernel.
 `-'" `"\_  ,_.-;_.-\_ ',  fsc/as   #
     _.-'_./   {_.'   ; /           #    -- FreeBSD Developers handbook
    {_.-``-'         {_/            #