Re: freebsd-update

On Tue, Jan 21, 2014 at 8:49 AM, John Baldwin <jhb_at_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_at_gmail.com>
> wrote:
> >
> > > On Tue, Jan 21, 2014 at 7:49 AM, Ivan Voras <ivoras_at_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.
>

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... every
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. It
does not use mergemaster or even a reasonable differences editor such as
the one mergemaster uses. Just going to the mergemaster code for handling
diffs would be a HUGE win. I am getting really tired of
"/<<<<<CR>3dd<dwn>ddn".
-- 
R. Kevin Oberman, Network Engineer, Retired
E-mail: rkoberman_at_gmail.com