From owner-freebsd-stable@FreeBSD.ORG Mon Mar 29 10:30:54 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 47324106564A for ; Mon, 29 Mar 2010 10:30:54 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-pz0-f197.google.com (mail-pz0-f197.google.com [209.85.222.197]) by mx1.freebsd.org (Postfix) with ESMTP id 1A61A8FC17 for ; Mon, 29 Mar 2010 10:30:53 +0000 (UTC) Received: by pzk35 with SMTP id 35so371824pzk.3 for ; Mon, 29 Mar 2010 03:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:received:message-id:subject:from:to:cc:content-type; bh=u06b0WqGVnf7j/Q3IprGUNpoamAkZiHZSOEFTBtNjWs=; b=CmHodh4NgNsTBmt/neYbWMOc2gU9KW7J73nMQQuY8x8GUfhR7itD67Jx3XTFOv6f2C RTeoqB2zXovGu3TvZcOEvaqVGWaufhzkCmHEu2mWZuoW7QiHT7+nMBYbpL0kdKtOXcHD RROPcGD3k/HZv5fv8jEgV41Y9lO3tP7U/dPg8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=EG+C7kGj0SsRhv82olojb2g+AYENxVOgxTHEJ6Bgy5g+BTdqKnjc1xAyS4saaqv3ZY RDeu+h58Gfcz+KldTa7peq8EUjg5d2WoIKRBFWceiwGhEK+dA66S/MrmuSc+O+pPVzu4 zeKV4zvPGTebcqrYolYlhyFPRSvQXOIRSQVt0= MIME-Version: 1.0 Received: by 10.143.8.14 with HTTP; Mon, 29 Mar 2010 03:30:53 -0700 (PDT) In-Reply-To: References: <4BAE2808.4010809@chef-ingenieur.de> Date: Mon, 29 Mar 2010 03:30:53 -0700 Received: by 10.142.55.18 with SMTP id d18mr1949151wfa.170.1269858653425; Mon, 29 Mar 2010 03:30:53 -0700 (PDT) Message-ID: <7d6fde3d1003290330v3a2dead4g45650f95409da345@mail.gmail.com> From: Garrett Cooper To: Matthias Andree Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-stable 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 10:30:54 -0000 On Mon, Mar 29, 2010 at 1:14 AM, Matthias Andree 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