From owner-freebsd-hackers@FreeBSD.ORG Fri May 6 15:07:26 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 4A1A316A4D3; Fri, 6 May 2005 15:07:26 +0000 (GMT) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E87143DB1; Fri, 6 May 2005 15:07:25 +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 j46F7FwO044703; Sat, 7 May 2005 00:37:16 +0930 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: Denis Peplin Date: Sat, 7 May 2005 00:37:03 +0930 User-Agent: KMail/1.8 References: <427743ED.6020200@FreeBSD.org> <200505062338.45418.doconnor@gsoft.com.au> <427B8317.2030606@FreeBSD.org> In-Reply-To: <427B8317.2030606@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2101590.BxynF7KHYr"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200505070037.10431.doconnor@gsoft.com.au> X-Spam-Score: -2.8 () IN_REP_TO,PGP_SIGNATURE_2,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_01_02,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 15:07:26 -0000 --nextPart2101590.BxynF7KHYr Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sat, 7 May 2005 00:15, Denis Peplin wrote: > > Like I said before etcmerge's UI is not like mergemaster - it is much > > more batch oriented. > > It is complicated for end-user to move from mergemaster to etcmerge > (need to install new tool, read manual, perform some additional work...) Maybe, I don't think it is that much effort. The gain is much less work and many fewer questions each update so it's nic= e. > > You don't need to download anything to start using etcmerge, you can ju= st > > use the files from your last mergemaster. > > For etcmerge it is need to run mergemaster "one last time", or use > etc archive for some release. So if mergemaster will be improved, > it will be better for etcmerge :) Well, you can use etcmerge if you haven't changed anything in /etc - ie on = a=20 fresh install. Even if the checksum test is added to mergemaster it only covers one of the= =20 cases etcmerge handles, it still doesn't do a 3 way merge. The merge etcmer= ge=20 does is very nice for removing changes to files you don't care about. > > 264k is a pretty large file to commit to the repo.. > > Yes, I know. And don't sure that it is some need to commit this file. > Anyway, this file is less that INDEX, and unlike INDEX, will not > rapidly changed. Checksum database will grow slowly. The INDEX file isn't in CVS anymore.. It probably won't grow very fast, but IMO it seems like a bit of a kludge. =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 --nextPart2101590.BxynF7KHYr Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQBCe4ge5ZPcIHs/zowRAtamAJ9bualhT+E6zEf8oINUjqxPPCq1GQCfZdcq rwr70ID83+u0xce2h9KiKqs= =LzwS -----END PGP SIGNATURE----- --nextPart2101590.BxynF7KHYr--