From owner-freebsd-questions@FreeBSD.ORG Fri Jan 24 16:33:01 2014 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F239F133 for ; Fri, 24 Jan 2014 16:33:01 +0000 (UTC) Received: from mail-ie0-x233.google.com (mail-ie0-x233.google.com [IPv6:2607:f8b0:4001:c03::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C21C3108A for ; Fri, 24 Jan 2014 16:33:01 +0000 (UTC) Received: by mail-ie0-f179.google.com with SMTP id ar20so3089662iec.38 for ; Fri, 24 Jan 2014 08:33:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:content-type; bh=bkw4Q3emqMQl2/dPRqqsUHyqfRcF+OfEsPOuH//NHg0=; b=x0vveD5eBbF4jMWsHPpKBOm1ownks9Edui8IfwiJaP5SwI9lraMgMJDM36Am+9ttW/ dHqYnTxVskPyw9L7pUwcQD7HWSKK4evUFPdaneUzCBv0YkdkjvjjGzs7GdLy1TU/87NL jpyPU8s6u5tmfEZOzzS0MGIOjByT3q6xUS1jVyehq7bnRWzSYAlx0qdd7MNmjhRd3YHi 8kfUOhQPk2NLLtSDd3QiAKbp5InQooRo3BB1viD4QF8Gt0X5zYKLGQRPswW1J7ZSqs7t nT7Gd3MS6yd0kOPsvYva78dooSwzH0CbInSBfC4kC4cDdx4+IIATa8C/dZ0Gkxy6gLC9 x2Dg== MIME-Version: 1.0 X-Received: by 10.50.61.140 with SMTP id p12mr5311613igr.29.1390581181112; Fri, 24 Jan 2014 08:33:01 -0800 (PST) Sender: vrwmiller@gmail.com Received: by 10.64.9.39 with HTTP; Fri, 24 Jan 2014 08:33:01 -0800 (PST) Date: Fri, 24 Jan 2014 11:33:01 -0500 X-Google-Sender-Auth: vwsBLUACq4NqiBOHKGnNuw4d09c Message-ID: Subject: freebsd-update automerge ignoring mergemaster.rc? From: Rick Miller To: FreeBSD Questions Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jan 2014 16:33:02 -0000 Hi all, Running FreeBSD 8.4-RELEASE-p7 and attempting to upgrade to 10.0-RELEASE via freebsd-update as instructed at http://www.freebsd.org/releases/10.0R/installation.html has resulted in errors during the automatic merge that occurs during "freebsd-update upgrade -r 10.0-RELEASE". The results are many merges that could not occur mainly due to the CVS version lines despite having /etc/mergemaster.rc setup. Here is the contents of the config file: /*** /etc/mergemaster.rc ***/ root@iese-bsd100-dev:~ # cat /etc/mergemaster.rc # Automatically install files that do not exist AUTO_INSTALL='yes' # Automatically upgrade files that have not been edited AUTO_UPGRADE='yes' # Ignore files that I don't want changed IGNORE_FILES='/etc/motd' # Do not display changes that only affect whitespace DIFF_FLAG="'.Bub'" # Ignore CVS id lines to stop replacing files where only that line has changed DIFF_OPTIONS='-I$FreeBSD:.*[$]' /*** /etc/mergemaster.rc ***/ I have tried different variations of DIFF_FLAG, "'-Bub'", and DIFF_OPTIONS, '-I $FreeBSD:.*[$]', both of which resulted in the same behavior. Based on threads I've read in the archives and a couple posts on the forums, this seems correct. Wondering if anyone has any thoughts and/or suggestions? -- Take care Rick Miller