From owner-freebsd-questions@FreeBSD.ORG Tue Feb 16 18:22:17 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 A315910656CC for ; Tue, 16 Feb 2010 18:22:17 +0000 (UTC) (envelope-from bahamasfranks@gmail.com) Received: from mail-qy0-f189.google.com (mail-qy0-f189.google.com [209.85.221.189]) by mx1.freebsd.org (Postfix) with ESMTP id 102C88FC1B for ; Tue, 16 Feb 2010 18:22:16 +0000 (UTC) Received: by qyk27 with SMTP id 27so4090987qyk.3 for ; Tue, 16 Feb 2010 10:22:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=38ZuRaXydCdIdJmgLnN1+d6Ekuz/5Csq/b9x6LwErBQ=; b=VzGhcV1MCaY77R9U0paqL5u9+0eqBz1l1RPbr+AC49N+5P31NBk9gqOKRPhfB7JX8D JSxD4tUvFhFQBB4wpIcw2XecT8cjtS0uoEllJ0RC5O89whFoELbcQWv4ICcqi8lLREfW EjNCsRBRMK1S8GAiW+0QDB/xuvK/kf7n4viv8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=tpuuN2YNi/MLQScSTMtorbwch4RvKbxgJp1x/U6ruhIntN/2AkCfm4HUBw0/Eu0G6l xpQLxdLdAhL7d0BQUB5mY0At/MMEJgv1pJYs+++Y5hWoYHTkJOOc9eAdnza/FexC+BSJ Vg8+QLTGKn24qXYnHaI2abb9rwTl3vPL1G3JY= MIME-Version: 1.0 Received: by 10.143.153.36 with SMTP id f36mr4271938wfo.311.1266344535914; Tue, 16 Feb 2010 10:22:15 -0800 (PST) In-Reply-To: <490F273F58BE854EBF3D5BE7CF7A8FC30393C797@cptisnmail01.korbitec.int> References: <490F273F58BE854EBF3D5BE7CF7A8FC30393C797@cptisnmail01.korbitec.int> Date: Tue, 16 Feb 2010 11:22:15 -0700 Message-ID: <539c60b91002161022j49105483l62ffbede050c42e1@mail.gmail.com> From: Steve Franks To: Peter Kirk Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-questions@freebsd.org Subject: Re: freebsd-update - Automatic merge X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2010 18:22:17 -0000 Search the list archives for emails pertaining to mergemaster.rc - it worked wonders for me! Steve 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 > _______________________________________________ > freebsd-questions@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to "freebsd-questions-unsubscribe@freebsd.o= rg" >