From owner-freebsd-current  Wed Feb  6 12: 0:37 2002
Delivered-To: freebsd-current@freebsd.org
Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39])
	by hub.freebsd.org (Postfix) with ESMTP id 6E72B37B404
	for <current@FreeBSD.ORG>; Wed,  6 Feb 2002 12:00:27 -0800 (PST)
Received: from InterJet.elischer.org ([12.232.206.8])
          by rwcrmhc53.attbi.com
          (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP
          id <20020206200027.VPHH10199.rwcrmhc53.attbi.com@InterJet.elischer.org>;
          Wed, 6 Feb 2002 20:00:27 +0000
Received: from localhost (localhost.elischer.org [127.0.0.1])
	by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id LAA92072;
	Wed, 6 Feb 2002 11:42:49 -0800 (PST)
Date: Wed, 6 Feb 2002 11:42:48 -0800 (PST)
From: Julian Elischer <julian@elischer.org>
To: "David W. Chapman Jr." <dwcjr@inethouston.net>
Cc: Lyndon Nerenberg <lyndon@orthanc.ab.ca>,
	Emiel Kollof <coolvibe@hackerheaven.org>, current@FreeBSD.ORG
Subject: Re: Mergemaster niggle 
In-Reply-To: <000d01c1af3e$25a52e60$d800a8c0@dwcjr>
Message-ID: <Pine.BSF.4.21.0202061140450.91961-100000@InterJet.elischer.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG

What I think mergemaster should do is compere the file with the original
checked out one it claims to be and if it's the same, it should just
update silently.. i.e. if  the user didn't change anything in th old one
he's unlikely to want to change anything in the new one....

(maybe a datafile that contains cksum outputs for each version of each
file)

On Wed, 6 Feb 2002, David W. Chapman Jr. wrote:

> >
> > I can see that happening on the head, but this also happens
> > on stable ...
> 
> One example of it happening to -stable was the addittion of www to
> master.passwd, www has been added and removed a few times from -stable.  I'm
> not trying to say that this explains all the times that it happens, just
> that it happens more than you might think.  I think we need to keep track of
> the RCSID's of the new and old files that exhibit this problem to better be
> able to keep track of it.
> 
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-current" in the body of the message
> 


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message