Re: freebsd-update
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 <jhb@freebsd.org> wrote:
>
>> 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: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
> "/<<<<<CR>3dd<dwn>ddn".
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--
討論串 (同標題文章)
完整討論串 (本文為第 7 之 19 篇)：