From owner-freebsd-hackers@FreeBSD.ORG Tue May 3 18:13:43 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 B177E16A4CE; Tue, 3 May 2005 18:13:43 +0000 (GMT) Received: from delight.idiom.com (delight.idiom.com [216.240.32.16]) by mx1.FreeBSD.org (Postfix) with ESMTP id 850F443D7C; Tue, 3 May 2005 18:13:43 +0000 (GMT) (envelope-from julian@elischer.org) Received: from idiom.com (idiom.com [216.240.32.1]) by delight.idiom.com (Postfix) with ESMTP id 5953A1D0B7D; Tue, 3 May 2005 11:13:37 -0700 (PDT) Received: from [192.168.2.3] (home.elischer.org [216.240.48.38]) by idiom.com (8.12.11/8.12.11) with ESMTP id j43IDYCs054760; Tue, 3 May 2005 11:13:37 -0700 (PDT) (envelope-from julian@elischer.org) Message-ID: <4277BF4D.3060507@elischer.org> Date: Tue, 03 May 2005 11:13:33 -0700 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.7) Gecko/20050424 X-Accept-Language: en, hu MIME-Version: 1.0 To: John Hay References: <427743ED.6020200@FreeBSD.org> <20050503094438.GA44097@zibbi.icomtek.csir.co.za> In-Reply-To: <20050503094438.GA44097@zibbi.icomtek.csir.co.za> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: hackers@freebsd.org cc: Denis Peplin 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: Tue, 03 May 2005 18:13:43 -0000 John Hay wrote: > On Tue, May 03, 2005 at 01:27:09PM +0400, Denis Peplin wrote: > >>The mergemaster with this is test patch (attached) >>can auto-update files that was not modified. >> >>It do this by compairing each file with it's CVS >>copy. If file was not modified, it can be rewritten. >> >>This dramatically redices amount of files that require >>admin's attention. >> >>There is one major problem here: >>This can be done in single-user mode only if your >>have local CVS repository, because if local CVS is >>not exist, anoncvs is used. >> >>Possible solutions: > > > What about mergemaster storing a copy of the original somewhere on disk > for usage next time? Then the first run may still be slow, but following > runs will be able to use it. > > John Mergemaster could keep checksums of known revisions. it wouldn't take much to have just one file with the last 35 checksums of each file. (maybe with the $FreeBSD$ line removed if it differs..)