From owner-freebsd-hackers@FreeBSD.ORG Fri May 6 13:49:20 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 A10E716A4D3; Fri, 6 May 2005 13:49:20 +0000 (GMT) Received: from volginfo.ru (ns.volginfo.ru [217.23.84.100]) by mx1.FreeBSD.org (Postfix) with ESMTP id D636E43D6A; Fri, 6 May 2005 13:49:19 +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 C9CFB2090; Fri, 6 May 2005 17:49:22 +0400 (MSD) Received: from [192.168.1.32] (llp-13.vistcom.ru [217.23.84.68]) by volginfo.ru (Postfix) with ESMTP id 1613B208E; Fri, 6 May 2005 17:49:22 +0400 (MSD) Message-ID: <427B75C8.9060100@FreeBSD.org> Date: Fri, 06 May 2005 17:48:56 +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> <4277BF4D.3060507@elischer.org> <427B4B7E.5070801@FreeBSD.org> <200505062220.43840.doconnor@gsoft.com.au> In-Reply-To: <200505062220.43840.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: 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, 06 May 2005 13:49:20 -0000 Hello! Daniel O'Connor wrote: > On Fri, 6 May 2005 20:18, Denis Peplin wrote: > You know you can just use etcmerge to do this.. > It does a 3 way merge between your files and the old and new revisions. > > The only down side is that it's UI is totally unlike mergemaster so it can be > a bit strange to get used to. Thank for pointing me to this script, I will look into it for ideas related to merging files that was modified. But for not modified files etcmerge is too complicated. Updating for not modified files should be done in fully automated mode. And for comparision, this file http://people.freebsd.org/~den/scripts/mergemaster/sums-etc.list.gz is only 264 kB in size. Unlike etcmerge archives (from link in etcmerge manpage), it contain checksums, and checksums included for every revision, even if it was not included in official release. I think that checksums database can be even committed into CVS and will not bloat it. Ideally, this way of updating should be available even for those users who have no access to internet (distribution recieved on CDROM, etc.)