Date: Mon, 04 May 2009 22:50:12 +0200 From: Torfinn Ingolfsen <torfinn.ingolfsen@broadpark.no> To: freebsd-stable@freebsd.org Subject: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? Message-ID: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no>
next in thread | raw e-mail | index | archive | help
Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. A few files on my machines are modified by me, and thus should nevber be upgraded: /etc/dhclient.conf /etc/motd (mergemeaster will usually ask about this - this time it did not, it claimed it wasn't user modified, huh?) /etc/profile /root/.profile /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) It can be more files, I haven't found out yet. Has anyone else seen this? I am upgrading my next machine, this time I'll have backups and keep better notes. -- Regards, Torfinn Ingolfsen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090504225012.392fa49f.torfinn.ingolfsen>