From owner-freebsd-current Wed Feb 6 10:43:21 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 99FF837B419 for ; Wed, 6 Feb 2002 10:43:17 -0800 (PST) Received: from dwcjr (dwcjr [192.168.0.216]) by leviathan.inethouston.net (Postfix) with SMTP id 8024B319AFB; Wed, 6 Feb 2002 12:43:20 -0600 (CST) Message-ID: <000d01c1af3e$25a52e60$d800a8c0@dwcjr> From: "David W. Chapman Jr." To: "Lyndon Nerenberg" Cc: "Emiel Kollof" , References: <200202061840.g16Ie7x71032@orthanc.ab.ca> Subject: Re: Mergemaster niggle Date: Wed, 6 Feb 2002 12:43:19 -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 > > 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