From owner-freebsd-questions@FreeBSD.ORG  Fri Jan 24 17:13:21 2014
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
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 EFF7D4D9
 for <freebsd-questions@freebsd.org>; Fri, 24 Jan 2014 17:13:21 +0000 (UTC)
Received: from mail-wg0-x234.google.com (mail-wg0-x234.google.com
 [IPv6:2a00:1450:400c:c00::234])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8469D13B8
 for <freebsd-questions@freebsd.org>; Fri, 24 Jan 2014 17:13:21 +0000 (UTC)
Received: by mail-wg0-f52.google.com with SMTP id b13so3304209wgh.7
 for <freebsd-questions@freebsd.org>; Fri, 24 Jan 2014 09:13:19 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=googlemail.com; s=20120113;
 h=date:from:to:subject:message-id:in-reply-to:references:mime-version
 :content-type:content-transfer-encoding;
 bh=RGpXuXJFEfdZhQvLqvqW95C2a1it0XXG1lBOlmh4t2Y=;
 b=BXnp/SoV4CWZijwR103m2UCkinmIWjNE5neIDTzgrLFisaJ1A3xAMtMu9xxQEg7A8e
 koPrcYEWvFhdJK9v5olNkYvyGPt3U2j4cGCk3gE/jHOIvg91OJhMbWQ19vTcqwVkE5lL
 tJAdh0qSDPaguPj5xUP9AYR9Z/gVfN8HiRNfn6IMiSUJGh2y4vP1LKrfNMgBKjq+zSqc
 Cjbl1az+cSVv156OVtFZoIFGAGF2z9Q07cRUNeRprciO8AWwzIQ2Stk6xxAQmr8ZahLW
 A1o+tPgkQ37TehUAKrE9UQ1708x8+flgxIxRXfa4RxTsz5PNR46LdniXQHO2NVrnzUFh
 ZDdA==
X-Received: by 10.180.90.37 with SMTP id bt5mr3921805wib.43.1390583599659;
 Fri, 24 Jan 2014 09:13:19 -0800 (PST)
Received: from gumby.homeunix.com (87-194-112-13.bethere.co.uk.
 [87.194.112.13])
 by mx.google.com with ESMTPSA id uq2sm3603981wjc.5.2014.01.24.09.13.17
 for <freebsd-questions@freebsd.org>
 (version=SSLv3 cipher=RC4-SHA bits=128/128);
 Fri, 24 Jan 2014 09:13:18 -0800 (PST)
Date: Fri, 24 Jan 2014 17:13:17 +0000
From: RW <rwmaillists@googlemail.com>
To: freebsd-questions@freebsd.org
Subject: Re: freebsd-update automerge ignoring mergemaster.rc?
Message-ID: <20140124171317.35574e28@gumby.homeunix.com>
In-Reply-To: <CAHzLAVFME_=W_21zQb3otbhByg8Rb1YT0tYSvTE5ngk+e_EtYg@mail.gmail.com>
References: <CAHzLAVFME_=W_21zQb3otbhByg8Rb1YT0tYSvTE5ngk+e_EtYg@mail.gmail.com>
X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; amd64-portbld-freebsd10.0)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions/>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jan 2014 17:13:22 -0000

On Fri, 24 Jan 2014 11:33:01 -0500
Rick Miller wrote:


> 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:

freebsd-update doesn't use mergemaster.