From owner-freebsd-hackers@FreeBSD.ORG Fri May 13 08:28:04 2005 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8620B16A4CE for ; Fri, 13 May 2005 08:28:04 +0000 (GMT) Received: from volginfo.ru (ns.volginfo.ru [217.23.84.100]) by mx1.FreeBSD.org (Postfix) with ESMTP id 127C443D53 for ; Fri, 13 May 2005 08:28:03 +0000 (GMT) (envelope-from den@FreeBSD.org) Received: from volginfo.ru (localhost.volginfo.ru [127.0.0.1]) by volginfo.ru (Postfix) with ESMTP id 0DF48208D; Fri, 13 May 2005 12:28:04 +0400 (MSD) Received: from [192.168.1.32] (llp-13.vistcom.ru [217.23.84.68]) by volginfo.ru (Postfix) with ESMTP id 06103208B; Fri, 13 May 2005 12:28:03 +0400 (MSD) Message-ID: <428464F6.2020005@FreeBSD.org> Date: Fri, 13 May 2005 12:27:34 +0400 From: Denis Peplin User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050331) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Daniel O'Connor References: <427743ED.6020200@FreeBSD.org> <200505062338.45418.doconnor@gsoft.com.au> <427B8317.2030606@FreeBSD.org> <200505070037.10431.doconnor@gsoft.com.au> In-Reply-To: <200505070037.10431.doconnor@gsoft.com.au> X-Enigmail-Version: 0.90.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP cc: freebsd-hackers@FreeBSD.org cc: Julian Elischer Subject: Re: mergemaster improvement (auto-update for not modified files) X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2005 08:28:04 -0000 Hello! Daniel O'Connor wrote: >>>You don't need to download anything to start using etcmerge, you can just >>>use the files from your last mergemaster. >> >>For etcmerge it is need to run mergemaster "one last time", or use >>etc archive for some release. So if mergemaster will be improved, >>it will be better for etcmerge :) > > > Well, you can use etcmerge if you haven't changed anything in /etc - ie on a > fresh install. I made another patch to mergemaster http://people.freebsd.org/~den/scripts/mergemaster/mergemaster-check-store.diff It poorly tested and have known problems, so it is not recommended for now, but shows how simular functionality can be included into mergemaster (with this patch mergemaster can collect some checksums itself). Unfortunately, this will help only on further updates. > > Even if the checksum test is added to mergemaster it only covers one of the > cases etcmerge handles, it still doesn't do a 3 way merge. The merge etcmerge > does is very nice for removing changes to files you don't care about. One case is the one important step to the better world :) I hope that we can made some small improvement to mergemaster before 5.5-RELEASE. And it is unlikely that we can introduce something other than mergemaster in RELENG_5. > > >>>264k is a pretty large file to commit to the repo.. >> >>Yes, I know. And don't sure that it is some need to commit this file. >>Anyway, this file is less that INDEX, and unlike INDEX, will not >>rapidly changed. Checksum database will grow slowly. > > > The INDEX file isn't in CVS anymore.. The reasons why it was removed can't be applied to checksums file. > It probably won't grow very fast, but IMO it seems like a bit of a kludge. I published my opinion here: http://people.freebsd.org/~den/scripts/mergemaster/checksums-commit.html Maybe it is not bikeshed discussion, but I don't want to continue it in hackers@. den@ is appropriate place :)