Date: Wed, 6 Feb 2002 14:13:08 -0600 From: "David W. Chapman Jr." <dwcjr@inethouston.net> To: "Julian Elischer" <julian@elischer.org> Cc: "Lyndon Nerenberg" <lyndon@orthanc.ab.ca>, "Emiel Kollof" <coolvibe@hackerheaven.org>, <current@FreeBSD.ORG> Subject: Re: Mergemaster niggle Message-ID: <00b901c1af4a$b1a0a320$d800a8c0@dwcjr> References: <Pine.BSF.4.21.0202061140450.91961-100000@InterJet.elischer.org>
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) > I think part of the problem(from what I'm hearing on irc), someone made a lot of commits to etc which weren't supposed to happen, but I cannot confirm all the facts at the moment. 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?00b901c1af4a$b1a0a320$d800a8c0>