Date: Fri, 06 May 2005 17:48:56 +0400 From: Denis Peplin <den@FreeBSD.org> To: Daniel O'Connor <doconnor@gsoft.com.au> Cc: Julian Elischer <julian@elischer.org> Subject: Re: mergemaster improvement (auto-update for not modified files) Message-ID: <427B75C8.9060100@FreeBSD.org> In-Reply-To: <200505062220.43840.doconnor@gsoft.com.au> References: <427743ED.6020200@FreeBSD.org> <4277BF4D.3060507@elischer.org> <427B4B7E.5070801@FreeBSD.org> <200505062220.43840.doconnor@gsoft.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
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.)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?427B75C8.9060100>