From owner-freebsd-questions@FreeBSD.ORG Wed Feb 23 21:50:13 2011 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49F6A106566B for ; Wed, 23 Feb 2011 21:50:13 +0000 (UTC) (envelope-from demelier.david@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id C64AC8FC0A for ; Wed, 23 Feb 2011 21:50:12 +0000 (UTC) Received: by bwz12 with SMTP id 12so658777bwz.13 for ; Wed, 23 Feb 2011 13:50:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=X7D2nOMBtFhnZHc9zhlnFXECnur8W9ojuV0aipWR1rk=; b=Hdsd77Zvt6XFNjOOiuImL+LCb1+QP2L2dBZg98oaUXGMFBthYomMs7Hd5iPZptg1fV xfF75UDoIpN8VpRCMspBfA8054R/NQZJm+J7BJGNlOct3vXmFGovuEgDSkJkG4Ams8i8 n9v1D/kE7JhC+0R4oRfsRqtDeipY4Ji8vEm7s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=rb+cGGAt6tp/X+Eacu539a0aH94ud75RBK8aTO2mD66RcvgWL5uBmkhztjkwyop0sg xb8PeTdK0EpOSK2Srpjj0+hHty1JzGrUVzEA7y/vVj0XrFYPdGNMcMCug0gG1o2CqHOX sJGYXpdUatyndK4TRemi8eUWZ5evqzbubtK8E= Received: by 10.204.124.20 with SMTP id s20mr8195bkr.194.1298497810964; Wed, 23 Feb 2011 13:50:10 -0800 (PST) Received: from Melon.malikania.fr (65.21.102-84.rev.gaoland.net [84.102.21.65]) by mx.google.com with ESMTPS id a17sm913443bku.23.2011.02.23.13.50.08 (version=SSLv3 cipher=OTHER); Wed, 23 Feb 2011 13:50:10 -0800 (PST) Message-ID: <4D6580EC.8090007@gmail.com> Date: Wed, 23 Feb 2011 22:49:32 +0100 From: David Demelier User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20110125 Thunderbird/3.1.7 MIME-Version: 1.0 To: freebsd-questions@freebsd.org References: <4D5CCB72.20505@gmail.com> <44ei75xyn6.fsf@be-well.ilk.org> In-Reply-To: <44ei75xyn6.fsf@be-well.ilk.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Lowell Gilbert Subject: Re: mergemaster -U ask for a lot non-user modified files X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 21:50:13 -0000 On 18/02/2011 14:25, Lowell Gilbert wrote: > David Demelier writes: > >> Hello, >> >> Each time I run mergemaster -UiF, it asks for a lot of file that I do >> not have modified such as /dev/rc.d/* and /etc/defaults/* >> >> >> ====================================================================== >> >> >> Use 'd' to delete the temporary ./etc/network.subr >> Use 'i' to install the temporary ./etc/network.subr >> Use 'm' to merge the temporary and installed versions >> Use 'v' to view the diff results again >> >> Default is to leave the temporary file to deal with by hand >> >> How should I deal with this? [Leave it for later] >> >> I never touched this file! Why it asks me to install the new one? > > You're probably having problems with the mtree database that mergemaster > uses for that. I think by default it's /var/db/mergemaster.mtree. > I also noticed that even with the -F flag, mergemaster still asks for files that only differs by CVS id, see : -##### $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1 2010/06/14 02:09:0 6 kensmith Exp $ ##### +##### $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.4.1 2010/12/21 17:09:2 5 kensmith Exp $ ##### It's really painful.. -- David Demelier