Date: Wed, 17 Feb 2010 09:26:48 +0000 From: Chris Rees <utisoft@googlemail.com> To: Steve Franks <bahamasfranks@gmail.com> Cc: freebsd-questions@freebsd.org, Peter Kirk <peterki@korbitec.com> Subject: Re: freebsd-update - Automatic merge Message-ID: <b79ecaef1002170126u5acf84f6le6a811fd521190b9@mail.gmail.com> In-Reply-To: <539c60b91002161022j49105483l62ffbede050c42e1@mail.gmail.com> References: <490F273F58BE854EBF3D5BE7CF7A8FC30393C797@cptisnmail01.korbitec.int> <539c60b91002161022j49105483l62ffbede050c42e1@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 16 February 2010 18:22, Steve Franks <bahamasfranks@gmail.com> wrote: > On Tue, Feb 16, 2010 at 3:55 AM, Peter Kirk <peterki@korbitec.com> wrote: >> Updating freebsd 7.2 to 8 and fan the following command >> >> freebsd-update upgrade -r 8.0-RELEASE >> >> Everything goes through fine but then it gets to a point and its says >> >> The following file could not be merged automatically: /etc/amd.map >> Press Enter to edit this file in vi and resolve the conflicts >> manually... >> >> It goes through hundreds of files, and it wants me to do the editing all >> myself, is there not automatic way to do this or just a simple yes no >> like mergemaster would ask? =A0This would take forever on our production >> servers > Search the list archives for emails pertaining to mergemaster.rc - it > worked wonders for me! > > Steve Thanks Steve, that's helped me too! Quick reference, the page he's referring to is http://lists.freebsd.org/pipermail/freebsd-questions/2009-August/203831.htm= l Some day I'll submit that to doc@ Chris
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b79ecaef1002170126u5acf84f6le6a811fd521190b9>