From owner-freebsd-questions@FreeBSD.ORG Sat Apr 25 11:28:34 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 01E7C1065677 for ; Sat, 25 Apr 2009 11:28:34 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (brucec-1-pt.tunnel.tserv4.nyc4.ipv6.he.net [IPv6:2001:470:1f06:c09::2]) by mx1.freebsd.org (Postfix) with ESMTP id B410D8FC14 for ; Sat, 25 Apr 2009 11:28:33 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (localhost [127.0.0.1]) by muon.cran.org.uk (Postfix) with ESMTP id BEEFE19011; Sat, 25 Apr 2009 12:28:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on muon X-Spam-Level: X-Spam-Status: No, score=-2.6 required=8.0 tests=AWL,BAYES_00,NO_RELAYS autolearn=ham version=3.2.5 Received: from gluon.draftnet (unknown [IPv6:2a01:348:10f:0:240:f4ff:fe57:9871]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by muon.cran.org.uk (Postfix) with ESMTPSA; Sat, 25 Apr 2009 12:28:36 +0000 (GMT) Date: Sat, 25 Apr 2009 12:28:25 +0100 From: Bruce Cran To: Peter Schuller Message-ID: <20090425122825.2cc0b090@gluon.draftnet> In-Reply-To: <20090425101042.GA48343@hyperion.scode.org> References: <20090425101042.GA48343@hyperion.scode.org> X-Mailer: Claws Mail 3.7.1 (GTK+ 2.14.7; i386-portbld-freebsd7.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: 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: Sat, 25 Apr 2009 11:28:34 -0000 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. -- Bruce Cran