From owner-freebsd-stable Wed Apr 17 1:31:12 2002 Delivered-To: freebsd-stable@freebsd.org Received: from wattres.Watt.COM (wattres.watt.com [205.178.120.6]) by hub.freebsd.org (Postfix) with ESMTP id 8CF6A37B419 for ; Wed, 17 Apr 2002 01:31:10 -0700 (PDT) Received: (from steve@localhost) by wattres.Watt.COM (8.12.2/8.12.2) id g3H8VAUa012599 for stable@freebsd.org; Wed, 17 Apr 2002 01:31:10 -0700 (PDT) (envelope-from steve) Message-Id: <200204170831.g3H8VAUa012599@wattres.Watt.COM> From: steve@Watt.COM (Steve Watt) Date: Wed, 17 Apr 2002 01:31:09 -0700 X-Mailer: Mail User's Shell (7.2.6 beta(5) 10/07/98) To: stable@freebsd.org Subject: mergmaster major weirdness Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I just did a fresh update to -stable for the syncookie problem (and it's been gosh, more than 2 months uptime on that box!), and besides the ATA tags brokenness issue, I ran over another interesting problem. It appears that mergemaster *missed* a couple of files, namely: /dev/MAKEDEV /etc/motd /etc/mail/helpfile I am very sure I wasn't asked about them at all. Running mergmaster a second time got them. Gotta love anomalies. No, it's not reproducable. -- Steve Watt KD6GGD PP-ASEL-IA ICBM: 121W 56' 57.8" / 37N 20' 14.9" Internet: steve @ Watt.COM Whois: SW32 Free time? There's no such thing. It just comes in varying prices... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message