From owner-freebsd-questions@FreeBSD.ORG Sun Apr 26 09:12:17 2009 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 AAC87106566B for ; Sun, 26 Apr 2009 09:12:17 +0000 (UTC) (envelope-from frederique@isafeelin.org) Received: from progress.isafeelin.org (progress.isafeelin.org [84.244.146.92]) by mx1.freebsd.org (Postfix) with ESMTP id 6A53D8FC08 for ; Sun, 26 Apr 2009 09:12:16 +0000 (UTC) (envelope-from frederique@isafeelin.org) Received: from progress.isafeelin.org (localhost [127.0.0.1]) by progress.isafeelin.org (Postfix) with ESMTP id 4830B130D9A; Sun, 26 Apr 2009 11:12:15 +0200 (CEST) Received: from s55919a03.adsl.wanadoo.nl (s55919a03.adsl.wanadoo.nl [85.145.154.3]) (using SSLv3 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by progress.isafeelin.org (Postfix) with ESMTPSA id 1C400130D99; Sun, 26 Apr 2009 11:12:15 +0200 (CEST) Received: from free.isafeelin.org (unknown [192.168.1.15]) by s55919a03.adsl.wanadoo.nl (Postfix) with ESMTP id EBDAE784FD; Sun, 26 Apr 2009 11:12:13 +0200 (CEST) Message-ID: <49F4256C.6090407@isafeelin.org> Date: Sun, 26 Apr 2009 11:12:12 +0200 From: Frederique Rijsdijk User-Agent: Thunderbird 2.0.0.21 (X11/20090418) MIME-Version: 1.0 To: Bruce Cran References: <20090425101042.GA48343@hyperion.scode.org> <20090425122825.2cc0b090@gluon.draftnet> In-Reply-To: <20090425122825.2cc0b090@gluon.draftnet> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Peter Schuller , freebsd-questions@freebsd.org Subject: Re: mergemaster -U overwriting 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: Sun, 26 Apr 2009 09:12:17 -0000 Bruce Cran wrote: > On Sat, 25 Apr 2009 12:10:42 +0200 > Peter Schuller wrote: > > >> I recently began testing mergemaster -U since the perpetual "review >> diff of file I never touched" grows annoying real quick. >> >> Unfortunately I recently discovered that it does not seem to do what >> you might expect. For example it nuked my mailer.conf on one machine, >> and my /etc/namedb/named.conf (!!!) on another machine. >> >> Is this a bug or intended? What is the intended functionality of -U? >> >> > > I noticed this recently too: after using mergemaster -U without > problems for a long time it suddenly went and overwrote named.conf on > a recently upgrade of 7-STABLE. > > I've seen this happen as well with named.conf. I've noticed that sometimes the -U flag doesn't work (I use -Ui), I still have to install the never touched files by hand. Can't put a finger on it though. -- Frederique