From owner-freebsd-current@FreeBSD.ORG  Tue Jan 21 17:26:44 2014
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 06DB8A78;
 Tue, 21 Jan 2014 17:26:44 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D045613DF;
 Tue, 21 Jan 2014 17:26:43 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id B1B36B945;
 Tue, 21 Jan 2014 12:26:42 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: freebsd-current@freebsd.org
Subject: Re: freebsd-update
Date: Tue, 21 Jan 2014 11:49:45 -0500
User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; )
References: <lblts0$9o1$1@ger.gmane.org>
 <CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w@mail.gmail.com>
 <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org>
In-Reply-To: <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201401211149.45793.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Tue, 21 Jan 2014 12:26:42 -0500 (EST)
Cc: David Chisnall <theraven@freebsd.org>, Ivan Voras <ivoras@freebsd.org>,
 Antonio Olivares <olivares14031@gmail.com>
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jan 2014 17:26:44 -0000

On Tuesday, January 21, 2014 10:46:37 am David Chisnall wrote:
> 
> On 21 Jan 2014, at 07:13, Antonio Olivares <olivares14031@gmail.com> wrote:
> 
> > On Tue, Jan 21, 2014 at 7:49 AM, Ivan Voras <ivoras@freebsd.org> wrote:
> >> Hi,
> >> 
> >> Is there any way I can avoid manually resolving hundreds of merge
> >> conflicts of the following type while using freebsd-update ?
> >> 
> >>  1 <<<<<<< current version
> >> 
> >> 
> >>  2 # $FreeBSD: release/9.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z
> >> peter $
> >> 
> >>  3 =======
> >> 
> >> 
> >>  4 # $FreeBSD: release/10.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z
> >> peter $
> >> 
> >>  5 >>>>>>> 10.0-RELEASE
> >> 
> >> 
> >> 
> >> ?
> >> 
> >> I can't be the only one seeing those...?
> >> 
> > 
> > Yes, One has to manually go one by one to fix these :(
> > I tried at one point a sed command like sed -i "" '>>>>'  to fix
> > these, but it did not work correctly.  I see errrors when booting when
> > I don't correct these :(
> 
> I thought this was fixed already (I didn't see these in the 9.2->10-RC3 
upgrade).  Doesn't freebsd-update pass -F (If the files differ only by VCS Id 
($FreeBSD) install the new file) to mergemaster?

AFAIK it doesn't use mergemaster?  I thought it used its own tool?  I really 
want to figure out a way to let it use etcupdate instead since it handles
this case even for locally modified files cleanly.

-- 
John Baldwin