From owner-freebsd-stable@FreeBSD.ORG Mon Mar 29 08:41:28 2010 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E22921065672 for ; Mon, 29 Mar 2010 08:41:28 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.freebsd.org (Postfix) with SMTP id 300858FC1D for ; Mon, 29 Mar 2010 08:41:27 +0000 (UTC) Received: (qmail invoked by alias); 29 Mar 2010 08:14:47 -0000 Received: from g229209220.adsl.alicedsl.de (EHLO mandree.no-ip.org) [92.229.209.220] by mail.gmx.net (mp025) with SMTP; 29 Mar 2010 10:14:47 +0200 X-Authenticated: #428038 X-Provags-ID: V01U2FsdGVkX19njVQNAnVnybEQyfgzCqdEyNOHtckiupo0xEDtq1 Ln+VBOlV1Di3vg Received: from merlin.emma.line.org (localhost [127.0.0.1]) by merlin.emma.line.org (Postfix) with ESMTP id EEEF994345; Mon, 29 Mar 2010 10:14:45 +0200 (CEST) Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: "Thomas Krause" , freebsd-stable References: <4BAE2808.4010809@chef-ingenieur.de> Date: Mon, 29 Mar 2010 10:14:45 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Matthias Andree" Organization: Message-ID: In-Reply-To: <4BAE2808.4010809@chef-ingenieur.de> User-Agent: Opera Mail/10.10 (Linux) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.56999999999999995 Cc: Subject: Re: freebsd-update 7.2->7.3 manul merging of all files X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2010 08:41:29 -0000 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. -- Matthias Andree