From owner-freebsd-current@FreeBSD.ORG  Tue Jan 21 15:13:41 2014
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@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 C90358D8;
 Tue, 21 Jan 2014 15:13:41 +0000 (UTC)
Received: from mail-ob0-x22f.google.com (mail-ob0-x22f.google.com
 [IPv6:2607:f8b0:4003:c01::22f])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 879BC175F;
 Tue, 21 Jan 2014 15:13:41 +0000 (UTC)
Received: by mail-ob0-f175.google.com with SMTP id wn1so3248059obc.20
 for <multiple recipients>; Tue, 21 Jan 2014 07:13:40 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=zd4aZKNQBUqM+oUX2y/02jZyLiPvvb/TfCCAjbQZIdg=;
 b=lfMlP10dHzA3bEaETF26LEX6zaH6M2ET+lxAmAl4LDGEAp6ECIECFlCSiPnouAIGdF
 LD4k6IIgsPczLhNw9Ob+nYOF2xpACTak4UVUcsbDy9Hui1Lt26dD9359RKkmiYGdODXM
 0Du43fdbelR4x49Ibqh466WY8RT2bsgR5ltd4nx0H8MRYw99yJTISGK9xrvUdefyL0I+
 Qd2ZU6ld0yfbnkF1piUPnrEHNd0RtXAUfqSE8hmLSxLv2Q3nNkJqv7rG82KQLIdWn437
 uMXcitSx26Zdbu8LDxl/VKd9Qy/DsAMPpwLCLwckiXDFigX1KpD5EzeEDmizWn0C7FyM
 z97g==
MIME-Version: 1.0
X-Received: by 10.182.223.114 with SMTP id qt18mr1881230obc.61.1390317220695; 
 Tue, 21 Jan 2014 07:13:40 -0800 (PST)
Received: by 10.76.168.137 with HTTP; Tue, 21 Jan 2014 07:13:40 -0800 (PST)
In-Reply-To: <lblts0$9o1$1@ger.gmane.org>
References: <lblts0$9o1$1@ger.gmane.org>
Date: Tue, 21 Jan 2014 09:13:40 -0600
Message-ID: <CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w@mail.gmail.com>
Subject: Re: freebsd-update
From: Antonio Olivares <olivares14031@gmail.com>
To: Ivan Voras <ivoras@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: freebsd-current@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:13:41 -0000

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

Hopefully someone suggests something better, but yes I do see these as well :(

Best Regards,


Antonio