From owner-freebsd-current Wed Feb 6 12:13:13 2002 Delivered-To: freebsd-current@freebsd.org Received: from leviathan.inethouston.net (leviathan.inethouston.net [66.64.12.249]) by hub.freebsd.org (Postfix) with ESMTP id B100337B416 for ; Wed, 6 Feb 2002 12:13:06 -0800 (PST) Received: from dwcjr (dwcjr [192.168.0.216]) by leviathan.inethouston.net (Postfix) with SMTP id D12CD319AFB; Wed, 6 Feb 2002 14:13:09 -0600 (CST) Message-ID: <00b901c1af4a$b1a0a320$d800a8c0@dwcjr> From: "David W. Chapman Jr." To: "Julian Elischer" Cc: "Lyndon Nerenberg" , "Emiel Kollof" , References: Subject: Re: Mergemaster niggle Date: Wed, 6 Feb 2002 14:13:08 -0600 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2600.0000 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: 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) > 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