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.dif >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 a bit strange to get used to. -- 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
pgpf5DGuzUAiL.pgp
Description: PGP signature
