From owner-freebsd-stable@FreeBSD.ORG Sat Mar 27 16:02:07 2010 Return-Path: Delivered-To: freebsd-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32D93106566B for ; Sat, 27 Mar 2010 16:02:07 +0000 (UTC) (envelope-from freebsd-stable@chef-ingenieur.de) Received: from mail.webmatic.de (mail.webmatic.de [212.78.101.66]) by mx1.freebsd.org (Postfix) with ESMTP id E863B8FC18 for ; Sat, 27 Mar 2010 16:02:06 +0000 (UTC) Received: from [192.168.178.25] (p5B0F5FD4.dip.t-dialin.net [91.15.95.212]) by mail.webmatic.de (Postfix) with ESMTPSA id 8E6C96D43E for ; Sat, 27 Mar 2010 16:45:12 +0100 (CET) Message-ID: <4BAE2808.4010809@chef-ingenieur.de> Date: Sat, 27 Mar 2010 16:45:12 +0100 From: Thomas Krause User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; de; rv:1.9.1.8) Gecko/20100227 Thunderbird/3.0.3 MIME-Version: 1.0 To: freebsd-stable Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Cc: Subject: freebsd-update 7.2->7.3 manul merging of all files X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 16:02:07 -0000 Hi, I want to upgrade a 7.2-RELEASE-p4 to 7.3-RELEASE with the command # freebsd-update upgrade -r 7.3-RELEASE After fetching and patching I get Attempting to automatically merge changes in files... done. The following file could not be merged automatically: /boot/device.hints Press Enter to edit this file in vi and resolve the conflicts manually... this goes on with *every* file in the /etc directory. What's wrong here? Best regards, Thomas.