From owner-freebsd-questions@FreeBSD.ORG Tue Jun 25 23:23:35 2013 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 63929CF1 for ; Tue, 25 Jun 2013 23:23:35 +0000 (UTC) (envelope-from feld@feld.me) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mx1.freebsd.org (Postfix) with ESMTP id 386991BFC for ; Tue, 25 Jun 2013 23:23:34 +0000 (UTC) Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 3BCF620939 for ; Tue, 25 Jun 2013 19:23:33 -0400 (EDT) Received: from web3.nyi.mail.srv.osa ([10.202.2.213]) by compute5.internal (MEProxy); Tue, 25 Jun 2013 19:23:34 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=feld.me; h= message-id:from:to:mime-version:content-transfer-encoding :content-type:subject:date:in-reply-to:references; s=mesmtp; bh= KmNvRNCObfPkTIWn76ijU0av/A4=; b=B248+6ozkOvfEJYfQOZ1Quf8O7jAaeky MpefcllHxE5Db7H+MWA11hCwtxiL0ZmVIR4ab+HRt3FzxbaXSRETm1T4YDULHoRf K2226AN9aDqSFnG+XYfcTe7LZ+1bP7stk6xtRxTGBnucOX7aldPnrcVBtxmXdqLR w8HNjqqu2HI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=message-id:from:to:mime-version :content-transfer-encoding:content-type:subject:date:in-reply-to :references; s=smtpout; bh=KmNvRNCObfPkTIWn76ijU0av/A4=; b=U3wVf ZmNWm2H7Rl2TsjexJeAHJKrRXV3/h6t+nXzKYWYVLULWEM3PIWixN0Ae2oGxGTfv PvCoeBteAEHBi+oOYfg1WJC3B6dHQCiGlNVJEvvWF8sVjJjhqqUV/9Hln87/UXLe qpqbspoD9FbBGkPoyAt1vpxZ6UCDJzoQLcB8E8= Received: by web3.nyi.mail.srv.osa (Postfix, from userid 99) id 5C60EB00006; Tue, 25 Jun 2013 19:23:33 -0400 (EDT) Message-Id: <1372202613.31128.140661248481181.0FF3DB85@webmail.messagingengine.com> X-Sasl-Enc: mZJw9If5Hweyf8E5T1jE5PUFZFte9USKQb062TqrRQPn 1372202613 From: Mark Felder To: freebsd-questions@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain X-Mailer: MessagingEngine.com Webmail Interface - ajax-5ae8e04c Subject: Re: Should I be able to use mergemaster with freebsd-update? Date: Tue, 25 Jun 2013 18:23:33 -0500 In-Reply-To: <2528F3423B004DCAAFC9B9F927C42D9E@geniepc2011> References: <201306250814.r5P8Eo4Z077311@chilled.skew.org> <2528F3423B004DCAAFC9B9F927C42D9E@geniepc2011> X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jun 2013 23:23:35 -0000 On Tue, Jun 25, 2013, at 15:29, Eugene wrote: > Hi all, > > I do not quite understand. Is the freebsd-update upgrade process > completely > broken? Or is it some special mode? Or was it broken recently? > Because some time ago I have upgraded from 8.1 to 8.2 quite nicely, with > editor-based merging of config files, and was planning to upgrade to 8.4 > soon (especially as 8.2 is already not compatible with some ports). > It depends on how many changes happen between the releases. Have you tried taking 7.x to 9.x before? You'll have to deal with that editor for merging many, many files. Maybe nearly everything in /etc. It's quite time consuming, whereas I can get mergemaster to auto-merge all of those files and only show me the 5 that I've personally touched.