freebsd-update 7.2->7.3 manul merging of all files

Thomas Krause freebsd-stable at chef-ingenieur.de
Sat Mar 27 16:02:07 UTC 2010


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.


More information about the freebsd-stable mailing list