Date: Fri, 6 May 2005 22:20:43 +0930 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: freebsd-hackers@freebsd.org Cc: Julian Elischer <julian@elischer.org> Subject: Re: mergemaster improvement (auto-update for not modified files) Message-ID: <200505062220.43840.doconnor@gsoft.com.au> In-Reply-To: <427B4B7E.5070801@FreeBSD.org> References: <427743ED.6020200@FreeBSD.org> <4277BF4D.3060507@elischer.org> <427B4B7E.5070801@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart1847702.MJjLLhZ6ae Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Fri, 6 May 2005 20:18, Denis Peplin wrote: > Hello! > > Julian Elischer wrote: > > 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..) > > Just implemented both variants (but second is not by count) > 1. Full checksum story for every file (~ 650k). > 2. Separated by date checksums (year 2000 was taken for example). > > New patch to mergemaster: > http://people.freebsd.org/~den/scripts/mergemaster/mergemaster-checksum.d= if >f Script to collect checksums: > http://people.freebsd.org/~den/scripts/mergemaster/etc_collect_checksums-= sp >litted.sh 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=20 a bit strange to get used to. =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --nextPart1847702.MJjLLhZ6ae Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQBCe2gj5ZPcIHs/zowRAnxPAJ4oKiYA5I8FoMZ0ffoMulbES8jusQCePfpI 81VXtGhUCNlN6of+YBrSgHs= =SmYZ -----END PGP SIGNATURE----- --nextPart1847702.MJjLLhZ6ae--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505062220.43840.doconnor>