From owner-freebsd-current@FreeBSD.ORG  Tue Jan 21 15:46:47 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 CC47D556;
 Tue, 21 Jan 2014 15:46:47 +0000 (UTC)
Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 988D61A4C;
 Tue, 21 Jan 2014 15:46:47 +0000 (UTC)
Received: from [192.168.5.208] (216-75-226-134.static.wiline.com
 [216.75.226.134]) (authenticated bits=0)
 by theravensnest.org (8.14.5/8.14.5) with ESMTP id s0LFkihX040669
 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO);
 Tue, 21 Jan 2014 15:46:45 GMT (envelope-from theraven@FreeBSD.org)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 7.0 \(1822\))
Subject: Re: freebsd-update
From: David Chisnall <theraven@FreeBSD.org>
In-Reply-To: <CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w@mail.gmail.com>
Date: Tue, 21 Jan 2014 07:46:37 -0800
Content-Transfer-Encoding: quoted-printable
Message-Id: <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org>
References: <lblts0$9o1$1@ger.gmane.org>
 <CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w@mail.gmail.com>
To: Antonio Olivares <olivares14031@gmail.com>
X-Mailer: Apple Mail (2.1822)
Cc: FreeBSD Current <freebsd-current@FreeBSD.org>,
 Ivan Voras <ivoras@FreeBSD.org>
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 15:46:47 -0000


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,
>>=20
>> Is there any way I can avoid manually resolving hundreds of merge
>> conflicts of the following type while using freebsd-update ?
>>=20
>>  1 <<<<<<< current version
>>=20
>>=20
>>  2 # $FreeBSD: release/9.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z
>> peter $
>>=20
>>  3 =3D=3D=3D=3D=3D=3D=3D
>>=20
>>=20
>>  4 # $FreeBSD: release/10.0.0/etc/csh.cshrc 50472 1999-08-27 =
23:37:10Z
>> peter $
>>=20
>>  5 >>>>>>> 10.0-RELEASE
>>=20
>>=20
>>=20
>> ?
>>=20
>> I can't be the only one seeing those...?
>>=20
>=20
> 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?

David