Date: Tue, 21 Jan 2014 11:49:45 -0500 From: John Baldwin <jhb@freebsd.org> To: freebsd-current@freebsd.org Cc: David Chisnall <theraven@freebsd.org>, Ivan Voras <ivoras@freebsd.org>, Antonio Olivares <olivares14031@gmail.com> Subject: Re: freebsd-update Message-ID: <201401211149.45793.jhb@freebsd.org> In-Reply-To: <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org> References: <lblts0$9o1$1@ger.gmane.org> <CAJ5UdcO6V_YnyoJSA=JRL_D7vFzZ8yXcKnh2QcjNQDskbpE98w@mail.gmail.com> <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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: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 :( > > 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? 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 handles this case even for locally modified files cleanly. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401211149.45793.jhb>