From owner-freebsd-current@FreeBSD.ORG Mon Jan 19 08:49:16 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C85FD16A4CE for ; Mon, 19 Jan 2004 08:49:16 -0800 (PST) Received: from winf.htu.tuwien.ac.at (winf.htu.tuwien.ac.at [128.131.95.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id B682E43D4C for ; Mon, 19 Jan 2004 08:49:15 -0800 (PST) (envelope-from leo@winf.htu.tuwien.ac.at) Received: by winf.htu.tuwien.ac.at (Postfix, from userid 1025) id 7E68B29D6; Mon, 19 Jan 2004 17:49:14 +0100 (CET) Date: Mon, 19 Jan 2004 17:49:14 +0100 From: Leonhard Wimmer To: rihad Message-ID: <20040119164914.GA90496@winf.at> References: <400C012E.4040002@mail.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <400C012E.4040002@mail.ru> User-Agent: Mutt/1.4.1i cc: freebsd-current@freebsd.org Subject: Re: question on mergemaster X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2004 16:49:16 -0000 On Jan 19 20:09, rihad wrote: > Hi. I was wondering if there are any improvements planned to be made to > mergemaster? After today's cvsup I had to sit and keep pressing either > "q" (to break out of the pager) or "i" to accept the new file. This *is* > boring, considering there seemed to be no end to them and I eventually > killed mergemaster, because I had started to get nervous and make silly > typos :). It's just my toy home machine and there's only few files under > /etc that I care about, and these mergemaster doesn't touch anyway (like > fstab, rc.conf etc). Wouldn't it be great if one could add the "assume > yes" flag so that it overwrites without prompting (like gentoo's > etc-update does when you ask it). Currently I came up with this dirty > hack to save myself from hundreds of confirmations, it kind of worked: > > # ( echo d; while :; do echo -e "q\ni"; done ) | mergemaster -i > > Is such an "no-prompt" option considered important enough to be > integrated RSN or am I missing some obvious and convenient usage pattern > everyone know about? It would be really nice if mergemaster automatically replaces all the files which weren't changed by the user. This could be done with an MD5 database of all the files in /etc. If they weren't changed since the last mergemaster they are automatically updated and if they were changed mergemaster asks the user what to do. Leo