freebsd-update

[Antonio Olivares]

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 :(

Hopefully someone suggests something better, but yes I do see these as well :(

Best Regards,


Antonio