Date: Mon, 29 Mar 2010 03:30:53 -0700 From: Garrett Cooper <yanefbsd@gmail.com> To: Matthias Andree <matthias.andree@gmx.de> Cc: freebsd-stable <freebsd-stable@freebsd.org> Subject: Re: freebsd-update 7.2->7.3 manul merging of all files Message-ID: <7d6fde3d1003290330v3a2dead4g45650f95409da345@mail.gmail.com> In-Reply-To: <op.vabk6v1s1e62zd@merlin.emma.line.org> References: <4BAE2808.4010809@chef-ingenieur.de> <op.vabk6v1s1e62zd@merlin.emma.line.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Mar 29, 2010 at 1:14 AM, Matthias Andree <matthias.andree@gmx.de> wrote:
> Am 27.03.2010, 16:45 Uhr, schrieb Thomas Krause:
>
>> Hi,
>> I want to upgrade a 7.2-RELEASE-p4 to 7.3-RELEASE with the command
>>
>> # freebsd-update upgrade -r 7.3-RELEASE
>>
>> After fetching and patching I get
>>
>> Attempting to automatically merge changes in files... done.
>>
>> The following file could not be merged automatically: /boot/device.hints
>> Press Enter to edit this file in vi and resolve the conflicts
>> manually...
>>
>> this goes on with *every* file in the /etc directory. What's wrong here?
>
> I got this once when updating from a self-built foo-STABLE to a -RELEASE
> later, because the $FreeBSD: ... tags were all wrong (and it was a nightmare
> that affected some 200 files).
>
> Did you installed your prior 7.2 system from a RELENG_7_2 cvsup/csup
> checkout, or was it a binary install?
>
> What triggers the conflicts for you - are there files where you only need to
> change the $FreeBSD: ... line but no others?
>
> I'm wondering if the etcmerge stuff should just ignore conflicts on the
> $FreeBSD$ line.
Do you perhaps mean mergemaster? There is an option for that, but
I'm not sure if it's fully functional (and quite frankly it's a pain
in the ass doing a 8-STABLE -> 9-CURRENT upgrade... I can readily
confirm that). I just took a peek at freebsd-update and it uses a
completely different scheme from mergemaster though which doesn't take
the $FreeBSD RCS lines into account.
One of the joys I've discovered of installing $FreeBSD based files
off CVS/SVN instead of RCS files tagged via csup // cvsup.
HTH,
-Garrett
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7d6fde3d1003290330v3a2dead4g45650f95409da345>