From owner-freebsd-hackers@FreeBSD.ORG Fri May 6 14:09:04 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 B653516A4D3; Fri, 6 May 2005 14:09:04 +0000 (GMT) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E98443D99; Fri, 6 May 2005 14:09:03 +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 j46E8pga043982; Fri, 6 May 2005 23:38:51 +0930 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: Denis Peplin Date: Fri, 6 May 2005 23:38:38 +0930 User-Agent: KMail/1.8 References: <427743ED.6020200@FreeBSD.org> <200505062220.43840.doconnor@gsoft.com.au> <427B75C8.9060100@FreeBSD.org> In-Reply-To: <427B75C8.9060100@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart13439456.VXEm5LbWIl"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200505062338.45418.doconnor@gsoft.com.au> X-Spam-Score: -2.5 () IN_REP_TO,PGP_SIGNATURE_2,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_02_03,USER_AGENT X-Scanned-By: MIMEDefang 2.16 (www . roaringpenguin . com / mimedefang) 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 14:09:04 -0000 --nextPart13439456.VXEm5LbWIl Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Fri, 6 May 2005 23:18, Denis Peplin wrote: > But for not modified files etcmerge is too complicated. Updating > for not modified files should be done in fully automated mode. hmm, but for unmodified files etcmerge does nothing - you don't have to do= =20 anything unless you want to edit the new files so it IS automated. Like I said before etcmerge's UI is not like mergemaster - it is much more= =20 batch oriented. > 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. You don't need to download anything to start using etcmerge, you can just u= se=20 the files from your last mergemaster. > 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.) 264k is a pretty large file to commit to the repo.. =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 --nextPart13439456.VXEm5LbWIl Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQBCe3pt5ZPcIHs/zowRAvFkAJ9NgeCmqFvM1shJ/mY8TCB8kmxgGQCeJK/R jI2o72ViJxbspHj6s91tl8A= =a5Ls -----END PGP SIGNATURE----- --nextPart13439456.VXEm5LbWIl--