Date: Sat, 27 Mar 2010 16:45:12 +0100 From: Thomas Krause <freebsd-stable@chef-ingenieur.de> To: freebsd-stable <freebsd-stable@FreeBSD.org> Subject: freebsd-update 7.2->7.3 manul merging of all files Message-ID: <4BAE2808.4010809@chef-ingenieur.de>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4BAE2808.4010809>