From owner-freebsd-questions@FreeBSD.ORG Mon Apr 27 08:33:24 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 2360A1065679 for ; Mon, 27 Apr 2009 08:33:24 +0000 (UTC) (envelope-from sudakov@sibptus.tomsk.ru) Received: from relay2.tomsk.ru (relay2.tomsk.ru [212.73.124.8]) by mx1.freebsd.org (Postfix) with ESMTP id 7A3D38FC25 for ; Mon, 27 Apr 2009 08:33:23 +0000 (UTC) (envelope-from sudakov@sibptus.tomsk.ru) X-Virus-Scanned: by clamd daemon 0.93.1 for FreeBSD at relay2.tomsk.ru Received: from admin.sibptus.tomsk.ru (account sudakov@sibptus.tomsk.ru [212.73.125.240] verified) by relay2.tomsk.ru (CommuniGate Pro SMTP 5.1.13) with ESMTPSA id 12394813 for freebsd-questions@freebsd.org; Mon, 27 Apr 2009 15:33:21 +0700 Received: (from sudakov@localhost) by admin.sibptus.tomsk.ru (8.13.6/8.13.6/Submit) id n3R8XLZg021051 for freebsd-questions@freebsd.org; Mon, 27 Apr 2009 15:33:21 +0700 (OMSST) (envelope-from sudakov@sibptus.tomsk.ru) X-Authentication-Warning: admin.sibptus.tomsk.ru: sudakov set sender to sudakov@sibptus.tomsk.ru using -f Date: Mon, 27 Apr 2009 15:33:21 +0700 From: Victor Sudakov To: freebsd-questions@freebsd.org Message-ID: <20090427083321.GA20534@admin.sibptus.tomsk.ru> Mail-Followup-To: Victor Sudakov , freebsd-questions@freebsd.org References: <20090425101042.GA48343@hyperion.scode.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090425101042.GA48343@hyperion.scode.org> User-Agent: Mutt/1.4.2.3i Organization: AO "Svyaztransneft", SibPTUS X-PGP-Key: http://vas.tomsk.ru/vas.asc 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: Mon, 27 Apr 2009 08:33:24 -0000 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? It may be useful, prior to running "mergemaster -U", to run mtree -eq -f /var/db/mergemaster.mtree -p / | grep changed to see what mergemaster considers changed. -- Victor Sudakov, VAS4-RIPE, VAS47-RIPN sip:sudakov@sibptus.tomsk.ru