From owner-freebsd-current@FreeBSD.ORG  Wed Mar 25 08:35:20 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A34A0106566C;
	Wed, 25 Mar 2009 08:35:20 +0000 (UTC)
	(envelope-from danger@FreeBSD.org)
Received: from services.rulez.sk (services.rulez.sk [92.240.234.125])
	by mx1.freebsd.org (Postfix) with ESMTP id 594BF8FC21;
	Wed, 25 Mar 2009 08:35:20 +0000 (UTC)
	(envelope-from danger@FreeBSD.org)
Received: from localhost (services.rulez.sk [92.240.234.125])
	by services.rulez.sk (Postfix) with ESMTP id 10CAB13344CB;
	Wed, 25 Mar 2009 09:15:36 +0100 (CET)
X-Virus-Scanned: amavisd-new at rulez.sk
Received: from services.rulez.sk ([92.240.234.125])
	by localhost (services.rulez.sk [92.240.234.125]) (amavisd-new,
	port 10024)
	with ESMTP id sh0F2chBUZ4M; Wed, 25 Mar 2009 09:15:35 +0100 (CET)
Received: from mac.local (danger.mcrn.sk [84.16.37.254])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	(Authenticated sender: danger@rulez.sk)
	by services.rulez.sk (Postfix) with ESMTPSA id 487D51334427;
	Wed, 25 Mar 2009 09:15:35 +0100 (CET)
Message-ID: <49C9E829.7050600@FreeBSD.org>
Date: Wed, 25 Mar 2009 09:15:37 +0100
From: Daniel Gerzo <danger@FreeBSD.org>
Organization: The FreeBSD Project
User-Agent: Thunderbird 2.0.0.21 (Macintosh/20090302)
MIME-Version: 1.0
To: Doug Barton <dougb@FreeBSD.org>
References: <5d97c6ec0903241231x73998539x1f8b52dcb75e3826@mail.gmail.com>
	<49C93E81.9080308@FreeBSD.org>
In-Reply-To: <49C93E81.9080308@FreeBSD.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: freebsd-current@freebsd.org, Nikolay Antsiferov <cenixxx@gmail.com>
Subject: Re: New mergemaster option to install files that differ only
	by	$FreeBSD
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: Wed, 25 Mar 2009 08:35:21 -0000

Doug Barton wrote:
> Nikolay Antsiferov wrote:
>> Hello.
>> Yesterday i use mergemaster -F option after installworld. Worked good
>> for me. All files that differ only by cvs tag were replaced. I update
>> from 8.0-CURRENT-200902 to head sources. Thanks.
> 
> Glad to hear it worked for you, and thank you for the success report!
> 

Maybe we could add it to src/Makefile, so that people know about it?

-- 
Best regards
   Daniel Gerzo