Date: Tue, 21 Jan 2014 07:46:37 -0800 From: David Chisnall <theraven@FreeBSD.org> To: Antonio Olivares <olivares14031@gmail.com> Cc: FreeBSD Current <freebsd-current@FreeBSD.org>, Ivan Voras <ivoras@FreeBSD.org> Subject: Re: freebsd-update Message-ID: <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org> In-Reply-To: <CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w@mail.gmail.com> References: <lblts0$9o1$1@ger.gmane.org> <CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5F09668C-0DEA-4074-A06C-BC4D29F92368>