From owner-freebsd-questions@FreeBSD.ORG Tue Jun 25 20:34:50 2013 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E3BF8399 for ; Tue, 25 Jun 2013 20:34:50 +0000 (UTC) (envelope-from genie@geniechka.ru) Received: from s1.loshmanov.ru (s1.loshmanov.ru [188.40.115.203]) by mx1.freebsd.org (Postfix) with ESMTP id A6DB5144C for ; Tue, 25 Jun 2013 20:34:49 +0000 (UTC) Received: from geniepc2011 (0894461339.static.corbina.ru [95.31.5.144]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by s1.loshmanov.ru (Postfix) with ESMTPSA id D10BEDF2DA0 for ; Wed, 26 Jun 2013 00:29:05 +0400 (MSK) Message-ID: <2528F3423B004DCAAFC9B9F927C42D9E@geniepc2011> From: "Eugene" To: References: <201306250814.r5P8Eo4Z077311@chilled.skew.org> In-Reply-To: <201306250814.r5P8Eo4Z077311@chilled.skew.org> Subject: Re: Should I be able to use mergemaster with freebsd-update? Date: Wed, 26 Jun 2013 00:29:00 +0400 MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=original Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal Importance: Normal X-Mailer: Microsoft Windows Live Mail 15.4.3555.308 X-MimeOLE: Produced By Microsoft MimeOLE V15.4.3555.308 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 20:34:51 -0000 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). Best wishes Eugene -----Original Message----- From: Mike Brown Sent: Tuesday, June 25, 2013 12:14 PM To: freebsd-questions@freebsd.org Subject: Re: Should I be able to use mergemaster with freebsd-update? > I'm using freebsd-update to upgrade my system to the latest minor version > (from 8.3-RELEASE to 8.4-RELEASE). > > I'm surprised that the merge handling system isn't more robust. When > upgrading > the old way, from source, I was used to using mergemaster to handle any > merges that couldn't be done automatically. > > But when using freebsd-update, it seems that any failed merges require > that > you get dumped into an empty text editor for each file. > [...] As I continue with this process, doing all the mergemaster tasks manually, I'm finding that the situation is even worse than I first realized. <........>