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

2010-03-29 Thread Garrett Cooper
On Mon, Mar 29, 2010 at 1:14 AM, Matthias Andree wrote: > Am 27.03.2010, 16:45 Uhr, schrieb Thomas Krause: > >> 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 automa

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

2010-03-29 Thread Matthias Andree
Am 27.03.2010, 16:45 Uhr, schrieb Thomas Krause: 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

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

2010-03-27 Thread Thomas Krause
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 e