> I do not remember mergemaster having a bootstrap stage in setting
> it up, a stage that should be executed before /usr/src (or whatever)
> is updated. So the procedures are different overall.
etcupdate does a 3-way merge.
What I did to replace mergemaster with etcupdate was:
rm -fr /usr/src
svnup release
etcupdate extract
rm -fr /usr/src
gitup release
cd /usr/src
make buildworld
make buildkernel
make installkernel
etcupdate -p
make installworld
etcupdate
make -DBATCH_DELETE_OLD_FILES delete-old
make -DBATCH_DELETE_OLD_FILES delete-old-libs
shutdown -r now
_______________________________________________
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
