freebsd-update
John Baldwin
jhb at freebsd.org
Tue Jan 21 17:26:44 UTC 2014
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.
--
John Baldwin
More information about the freebsd-current
mailing list