From owner-freebsd-stable Tue Jan 23 20:50:16 2001 Delivered-To: freebsd-stable@freebsd.org Received: from citusc17.usc.edu (citusc17.usc.edu [128.125.38.177]) by hub.freebsd.org (Postfix) with ESMTP id 6E7BE37B400 for ; Tue, 23 Jan 2001 20:49:58 -0800 (PST) Received: (from kris@localhost) by citusc17.usc.edu (8.11.1/8.11.1) id f0O4rRA26472; Tue, 23 Jan 2001 20:53:27 -0800 (PST) (envelope-from kris) Date: Tue, 23 Jan 2001 20:53:27 -0800 From: Kris Kennaway To: "[gill]" Cc: freebsd-stable@FreeBSD.ORG Subject: Re: and IDea I had Message-ID: <20010123205327.B26378@citusc17.usc.edu> References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="tsOsTdHNUZQcU9Ye" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from gill@topsecret.net on Tue, Jan 23, 2001 at 10:11:54PM -0500 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG --tsOsTdHNUZQcU9Ye Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 23, 2001 at 10:11:54PM -0500, [gill] wrote: >=20 > today I ran into a problem that was my fault and involved careless use of > mergemaster (ConnectionsPerPeriod is depricated, fwiw). I had cvsup'd a > brand new box from 4.2-R to 4.2-S and a single file which i had NOT edited > from the original version that installed with 4.2-R did not get replaced. >=20 > I started thinking, I see this tag that is related to the CVS revisioning > on each of the files: > # $FreeBSD: src/etc/hosts,v 1.11.2.1 2000/08/18 18:29:19 ume Exp $ >=20 > and i wondered: what if this tag were expanded to include a checksum of > that file so that mergemaster could decide if the file had been edited and > ifF not, it could (as an option) automagically replace. And where would it compare the checksum against? ;-) Mergemaster can already do this by diffing the installed version with the one in /usr/src - by default it doesn't though, and only checks the $FreeBSD$ headers because it results in less spurious merge dialogs (i.e. every time you run the program it will ask for merges on the same set of files, because they're still different). Check the manpage. Kris --=20 NOTE: To fetch an updated copy of my GPG key which has not expired, finger kris@FreeBSD.org --tsOsTdHNUZQcU9Ye Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.4 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE6bl/GWry0BWjoQKURAqSjAJ9Wwtv/pg04GeE5B7prKs5ygxJ7CQCbBElR 8nIuCWFh8AMo7ooV5Ly9gm0= =oEAq -----END PGP SIGNATURE----- --tsOsTdHNUZQcU9Ye-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message