From owner-freebsd-current@FreeBSD.ORG Sat Jan 25 11:32:41 2014 Return-Path: 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 86246427 for ; Sat, 25 Jan 2014 11:32:41 +0000 (UTC) Received: from mail.0x20.net (mail.0x20.net [IPv6:2001:aa8:fffb:1::3]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1B79F18D6 for ; Sat, 25 Jan 2014 11:32:40 +0000 (UTC) Received: from e-new.0x20.net (mail.0x20.net [IPv6:2001:aa8:fffb:1::3]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.0x20.net (Postfix) with ESMTPS id 6A8E56A6006; Sat, 25 Jan 2014 12:32:38 +0100 (CET) Received: from e-new.0x20.net (localhost [127.0.0.1]) by e-new.0x20.net (8.14.7/8.14.7) with ESMTP id s0PBWcav039772; Sat, 25 Jan 2014 12:32:38 +0100 (CET) (envelope-from lars@e-new.0x20.net) Received: (from lars@localhost) by e-new.0x20.net (8.14.7/8.14.7/Submit) id s0PBWakL039716; Sat, 25 Jan 2014 12:32:36 +0100 (CET) (envelope-from lars) Date: Sat, 25 Jan 2014 12:32:36 +0100 From: Lars Engels To: Allan Jude Subject: Re: freebsd-update Message-ID: <20140125113236.GX86491@e-new.0x20.net> References: <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org> <201401211149.45793.jhb@freebsd.org> <52E2C1BC.10202@allanjude.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="+smLgjZrX8DJCqNF" Content-Disposition: inline In-Reply-To: <52E2C1BC.10202@allanjude.com> X-Editor: VIM - Vi IMproved 7.4 X-Operation-System: FreeBSD 8.4-RELEASE-p4 User-Agent: Mutt/1.5.22 (2013-10-16) 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 11:32:41 -0000 --+smLgjZrX8DJCqNF Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 24, 2014 at 02:40:44PM -0500, Allan Jude wrote: > On 2014-01-21 15:42, Kevin Oberman wrote: > > On Tue, Jan 21, 2014 at 8:49 AM, John Baldwin wrote: > > > >> On Tuesday, January 21, 2014 10:46:37 am David Chisnall wrote: > >>> On 21 Jan 2014, at 07:13, Antonio Olivares > >> wrote: > >>>> On Tue, Jan 21, 2014 at 7:49 AM, Ivan Voras > >> 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:1= 0Z > >>>>> peter $ > >>>>> > >>>>> 3 =3D=3D=3D=3D=3D=3D=3D > >>>>> > >>>>> > >>>>> 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 wh= en > >>>> I don't correct these :( > >>> I thought this was fixed already (I didn't see these in the 9.2->10-R= C3 > >> 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 hand= les > >> this case even for locally modified files cleanly. > >> > > Having just gone through this on a 10.0-rc5 to 10.0-RELEASE run, I can > > assure you that it is not completely fixed. One huge part is fixed... e= very > > file's ID line is no longer is changed on every release. OTOH, for files > > that are modified, thy still show up. It hit many of the sendmail .cf > > files. Annoying as I don't even use sendmail. > > > > Not sure if there was a good reason Colin re-invented the wheel on this= =2E It > > does not use mergemaster or even a reasonable differences editor such as > > the one mergemaster uses. Just going to the mergemaster code for handli= ng > > diffs would be a HUGE win. I am getting really tired of > > "/<<<<3ddddn". >=20 > I discussed this a bit with Colin on Wednesday during our interview with > him for BSDNow.tv >=20 > He had some problems with mergemaster so wrote his own tool. In 10 it > ignores the $Id tags, but there are still other changes that have to > either be merged or the file replaced with the new one. >=20 > I am all for further improvement here. Also using freebsd-update behind a proxy is really slow. Even with a very fast internet connection (normally download rates ca. 3 MBytes / s) downloading all the tiny binary diff files took more than 8 hours. Maybe freebsd-update's backend could create a tarball of all those diffs and provide this?=20 --+smLgjZrX8DJCqNF Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iEYEARECAAYFAlLjoNQACgkQKc512sD3afjlQQCgq14NXTvy402XPx9z3L0o6eyG Kz0AnjGleQjoXiCGdAXmKOx+3/zWH6Wv =awd7 -----END PGP SIGNATURE----- --+smLgjZrX8DJCqNF--