From owner-freebsd-stable Sat Jul 14 8:35:31 2001 Delivered-To: freebsd-stable@freebsd.org Received: from dookie.local (pc1-reda3-0-cust222.bre.cable.ntl.com [213.105.80.222]) by hub.freebsd.org (Postfix) with SMTP id B048C37B403 for ; Sat, 14 Jul 2001 08:35:20 -0700 (PDT) (envelope-from jon@witchspace.com) Received: (qmail 91899 invoked from network); 14 Jul 2001 15:35:14 -0000 Received: from lexx.local (HELO witchspace.com) (192.168.0.1) by dookie.local with SMTP; 14 Jul 2001 15:35:14 -0000 Message-ID: <3B50671A.B8FBBD7B@witchspace.com> Date: Sat, 14 Jul 2001 16:36:58 +0100 From: Jonathan Belson X-Mailer: Mozilla 4.77 [en] (X11; U; Linux 2.2.12 i386) X-Accept-Language: en MIME-Version: 1.0 To: freebsd-stable@freebsd.org Subject: [Q] Mergemaster problem Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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 Hiya I've just upgraded my machine to a more recent version of -stable. Everything went swimmingly until I ran mergemaster...whenever I try to install an updated file I get an error, eg. *** Problem installing ./etc/defaults/pccard.conf, it will remain to merge by hand The verbose option gives no clues and I couldn't find anything relevent in the -stable archives. Anyone have any clues? -- C-YA Jon To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message