Date: Tue, 12 Aug 2003 22:10:20 -0400 From: otzinger@attcanada.ca To: "Mike Maltese" <mike@pcmedx.com>, freebsd-questions@freebsd.org Subject: mergemaster clarification Message-ID: <20030812221020.266aabd8.otzinger@attcanada.ca> In-Reply-To: <000701c360b4$3c510bb0$f4f0a8c0@pcmedx.com> References: <20030812025041.41230bb9.epilogue@attcanada.ca> <000701c360b4$3c510bb0$f4f0a8c0@pcmedx.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 12 Aug 2003 02:29:31 -0700 "Mike Maltese" <mike@pcmedx.com> wrote: > > possible. various sources (handbook, man page, absolute bsd, google) > indicated > > that mergemaster would compare files for differences. it did, but it only > presented > > 4 different files. i had the impression that mergemaster would run > through *all* the > > files in /etc. was i wrong to expect this? > > Kinda. Mergemaster will only attempt to merge files that are different from > source. Either the four files it compared were modified by you in the > configuration of your system, or they were updated in the source tree (or > both). it is precisely because i modified *many* files under /etc (like rc.conf, master.passwd, group, adduser.conf, XF86Config, fstab, gettytab, ttys, and on and on...) that i expected mergemaster to present me with more than just 4 files to compare (which were ppp.conf, motd, csh.cshrc, and one other which i no longer recall). is this the expected behaviour? [tks for your quick reply, mike.] > > my cvsup file includes this line -- *default release=cvs tag=RELENG_4_8. > if i > > understand the cvsup instructions correctly, this means i should only get > > code for security advisories and other seriously critical fixes. the > original install > > Yes. > > > > > does this mean that make world only rebuilds part of the code and not the > whole > > system? could this be why mergemaster did not ask me about all the files > in /etc? > > The make buildworld process will build everything and make installworld will > replace everything (and if I'm wrong here I'm sure someone will correct me). > > Hope this helps - Mike > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030812221020.266aabd8.otzinger>