From owner-freebsd-current@FreeBSD.ORG Fri Jan 24 19:46:29 2014 Return-Path: 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 854A7771 for ; Fri, 24 Jan 2014 19:46:29 +0000 (UTC) Received: from mx1.scaleengine.net (beauharnois2.bhs1.scaleengine.net [142.4.218.15]) by mx1.freebsd.org (Postfix) with ESMTP id 40F40123A for ; Fri, 24 Jan 2014 19:46:28 +0000 (UTC) Received: from [10.1.1.1] (S01060001abad1dea.hm.shawcable.net [50.70.146.73]) (Authenticated sender: allan.jude@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id 207F854171 for ; Fri, 24 Jan 2014 19:40:41 +0000 (UTC) Message-ID: <52E2C1BC.10202@allanjude.com> Date: Fri, 24 Jan 2014 14:40:44 -0500 From: Allan Jude User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: freebsd-current@freebsd.org Subject: Re: freebsd-update References: <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org> <201401211149.45793.jhb@freebsd.org> In-Reply-To: X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Arq91lVgAp7o36hCdNUACGat4Iukbast5" 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: Fri, 24 Jan 2014 19:46:29 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Arq91lVgAp7o36hCdNUACGat4Iukbast5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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 file= s > 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 a= s > 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". I discussed this a bit with Colin on Wednesday during our interview with him for BSDNow.tv 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. I am all for further improvement here. --=20 Allan Jude --Arq91lVgAp7o36hCdNUACGat4Iukbast5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJS4sHBAAoJEJrBFpNRJZKf82kP/iDgK60klkTEAbppXOKzixIu 4OSX9UGkdt5A/dgVWkp+E3WnZoGVOkh1dcVOlyewo80zVD+E+GpCbBSJ762Rz5WS 4uM+63ouZgDKr9fl9s9jIHOG+yv8+yv2oWAzIUoi/UACfTlPNvAeiQqDsPMW0o6e Q19C+gwYQv7c8sl6EiA7eKnLNd9CLrUSjpbI9+nMb6cDkWPMYvHDxw03EPECX9ai ayuZ/R3d5JjB8zj+hZ+YZJlLjdsIhel/KClx2ftNCJS+KZeDwmj41k1dSiZm2vwT u4Y4D+oyl8Izj5k5kfdSVpf7ekUyaWkVrKxrroEKcKdoc5LaO7jTXlqDwBX5sGrQ wmjp1v7QFQiUA6R0oNfFJKnEWITvaSMl64sLYts+Upsav3QkWXeoKmTMjZPAtYDU Uh4pNrAP2PlVmgloGK1Gd8kPMXcovc+Mz4+BMgO3jSERzVjx0BAUpcB/ujwXAZ5u IPjMIHQLsp6r9t5c4G8GO0d13My+wssWKgd9laH3MhvP56i/VsTDaQca6POQDOV9 wRfPgRtjG1Vnz4bA671l5RPhTEXcoRITQu6vFxrcQIaaQix1fxoWGkPuSQyxtphF ZqcVkQUIsM35nvHY9pW35Rc3ZlMSSwWAh8yjHMn+Ox/Q/Vd2IK6O8IY08ovChAt3 BIRlNVJcLQj97KooML07 =wUWy -----END PGP SIGNATURE----- --Arq91lVgAp7o36hCdNUACGat4Iukbast5--