From owner-freebsd-stable Thu May 17 5: 7:46 2001 Delivered-To: freebsd-stable@freebsd.org Received: from mail.squidge.com (ns1.squidge.com [195.10.252.5]) by hub.freebsd.org (Postfix) with ESMTP id 164AE37B422 for ; Thu, 17 May 2001 05:07:42 -0700 (PDT) (envelope-from stewart@nameless-uk.com) Received: from apollo (host217-32-152-102.hg.mdip.bt.net [217.32.152.102]) (authenticated) by mail.squidge.com (8.11.1/8.11.1) with ESMTP id f4HC7eh94656 for ; Thu, 17 May 2001 13:07:40 +0100 (BST) (envelope-from stewart@nameless-uk.com) Reply-To: From: "Stewart Morgan" To: Subject: Administrative tag a possibility? Date: Thu, 17 May 2001 13:07:19 +0100 Organization: Nameless-UK Message-ID: <00df01c0dec9$ef270b00$0b01000a@apollo> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook, Build 10.0.2605 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2462.0000 Importance: Normal Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > > Mike Smith wrote: > > > > > ... > > > Say introducing a convention like '$!$' to denote an always to be > > > acceptable change? > > > > No, not acceptable. > > > > In this case, mergemaster should be smart enough to notice that the > > file in question was unchanged before the merge, and just > not irritate > > you in the first place. > > You've just won my vote! Nonetheless I think a simple pattern > match like "$!$" could've been implemented long ago - thus > saving me uncounted q+i keypresses, whereas introducing > smartness into a program might take a tad longer. > Wasn't there a discussion on something like this ages ago? I seem to recall somebody suggesting MD5 checksums to see if a file has changed or not and acting acordingly. If you're worried about maintaining a database of checksums, why not place it in the file itself. Of course somebody'll mention recursion: if you grep -v CHECKSUM | md5 and compare with grep CHECKSUM, you've got something that works and is easy to maintain. Just my 2p worth :) Stewart. -- Stewart Morgan MEng AMIEEE Technical Director, Nameless-UK T: +44 117 974 55 44 | A: The Production House F: +44 870 168 02 10 | 147a St. Michael's Hill E: stewart@nameless-uk.com | Bristol W: www.nameless-uk.com | BS2 8DB To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message