Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Jun 2013 00:29:00 +0400
From:      "Eugene" <genie@geniechka.ru>
To:        <freebsd-questions@freebsd.org>
Subject:   Re: Should I be able to use mergemaster with freebsd-update?
Message-ID:  <2528F3423B004DCAAFC9B9F927C42D9E@geniepc2011>
In-Reply-To: <201306250814.r5P8Eo4Z077311@chilled.skew.org>
References:  <201306250814.r5P8Eo4Z077311@chilled.skew.org>

Next in thread | Previous in thread | Raw E-Mail | Index | Archive | Help
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.

<........> 




Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?2528F3423B004DCAAFC9B9F927C42D9E>