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 Message-ID: <Pine.BSF.4.21.0202061140450.91961-100000@InterJet.elischer.org> In-Reply-To: <000d01c1af3e$25a52e60$d800a8c0@dwcjr>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0202061140450.91961-100000>