Date: Tue, 12 Aug 2003 19:50:07 -0700 From: "Mike Maltese" <mike@pcmedx.com> To: <freebsd-questions@freebsd.org> Cc: otzinger@attcanada.ca Subject: Re: mergemaster clarification Message-ID: <001401c36145$9b202a40$f4f0a8c0@pcmedx.com> References: <20030812025041.41230bb9.epilogue@attcanada.ca><000701c360b4$3c510bb0$f4f0a8c0@pcmedx.com> <20030812221020.266aabd8.otzinger@attcanada.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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? Take a look through /usr/src/etc. These are the files that will potentially be comapred. As an example, XF86Config isn't part of the base system, it is created by the user and therefore has nothing to be compared to. The main reason for there not being many files compared is probably that few, if any, of these files have changed during the lifespan of the RELENG_4_8. If you were to upgrade to 4.8-STABLE you would probably be presented with several files for merging. > [tks for your quick reply, mike.] I'm no expert but I try to help when I can. =)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?001401c36145$9b202a40$f4f0a8c0>