From owner-freebsd-hackers@FreeBSD.ORG Fri May 6 12:51:03 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 0C4D516A4D0; Fri, 6 May 2005 12:51:03 +0000 (GMT) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC8E443D86; Fri, 6 May 2005 12:51:01 +0000 (GMT) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.gsoft.com.au (localhost [127.0.0.1]) (authenticated bits=0) by cain.gsoft.com.au (8.12.11/8.12.10) with ESMTP id j46CooWi043236; Fri, 6 May 2005 22:20:50 +0930 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: freebsd-hackers@freebsd.org Date: Fri, 6 May 2005 22:20:43 +0930 User-Agent: KMail/1.8 References: <427743ED.6020200@FreeBSD.org> <4277BF4D.3060507@elischer.org> <427B4B7E.5070801@FreeBSD.org> In-Reply-To: <427B4B7E.5070801@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1847702.MJjLLhZ6ae"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200505062220.43840.doconnor@gsoft.com.au> X-Spam-Score: -2.5 () IN_REP_TO,PGP_SIGNATURE_2,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_00_01,USER_AGENT X-Scanned-By: MIMEDefang 2.16 (www . roaringpenguin . com / mimedefang) cc: hackers@freebsd.org cc: Denis Peplin 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 12:51:03 -0000 --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--