From owner-freebsd-questions@FreeBSD.ORG Wed Feb 17 09:27:10 2010 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A3CE106566B for ; Wed, 17 Feb 2010 09:27:10 +0000 (UTC) (envelope-from utisoft@googlemail.com) Received: from mail-bw0-f223.google.com (mail-bw0-f223.google.com [209.85.218.223]) by mx1.freebsd.org (Postfix) with ESMTP id 87B6F8FC16 for ; Wed, 17 Feb 2010 09:27:09 +0000 (UTC) Received: by bwz23 with SMTP id 23so1786340bwz.13 for ; Wed, 17 Feb 2010 01:27:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:received:reply-to:in-reply-to :references:from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=uIit6/POipWaWZY7v7+vjR3LldSIPKcmucGr1YtecFg=; b=s/CzdhxQgxdA4IAA0GaDt5dtvZU/5iGmuy/Rb4NH/ZhxeocnEncO6v1tNhy33LmRQD bB82KVkyMHxSzjCqDy1UT3n9LG1V/jto6j9N5pbxS7agqG1AUs9zkgDRxz0IG4Qx9wOm JUqXc2mg91KnNJO2kfMDpKr0Fj1d+E6oSsSyI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:reply-to:in-reply-to:references:from:date:message-id :subject:to:cc:content-type:content-transfer-encoding; b=ozzXAqxmcIHw+PlYGYQU3N7GLmHdVzF9chQ23t1xC3lLHz/skY+La0mFUvDhcHXeQZ FN8H3wC7q+OpZy7KR54ZlG8FWmGBfoI7IEcVC1oAZIAm0+wn5A8ls1/BF8mJnENPqmZa NDcm6PE7WpcKPu+GwBPdTYI4V6Md5wIrY7cvY= MIME-Version: 1.0 Received: by 10.204.129.82 with SMTP id n18mr5084234bks.132.1266398828174; Wed, 17 Feb 2010 01:27:08 -0800 (PST) In-Reply-To: <539c60b91002161022j49105483l62ffbede050c42e1@mail.gmail.com> References: <490F273F58BE854EBF3D5BE7CF7A8FC30393C797@cptisnmail01.korbitec.int> <539c60b91002161022j49105483l62ffbede050c42e1@mail.gmail.com> From: Chris Rees Date: Wed, 17 Feb 2010 09:26:48 +0000 Message-ID: To: Steve Franks Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-questions@freebsd.org, Peter Kirk Subject: Re: freebsd-update - Automatic merge X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: utisoft@gmail.com List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Feb 2010 09:27:10 -0000 On 16 February 2010 18:22, Steve Franks wrote: > On Tue, Feb 16, 2010 at 3:55 AM, Peter Kirk 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