: Hello !
: I've just updated my FreeBSD4.3 to 4.4RELEASE .... everything seems to be
: alright :o) .... but .... I just want to ask ...
:
: after the # mergemaster
: I got screens showing difference between some of my files and the new one
: ... and asking whether I'd like to merge them anyway or just leave the old
: one(my previous files ) .... I've chosen the default option( leave my
: previous files ....not to merge them ) ...
:
: So later , wouldn't this cause troubles ? Shoudl I go back to
: meargemaster and redo the merging ?
Yes, it can cause problems. Generally you'll want to merge new
versions into your files and confirm that they merged correctly. -Or
merge them by hand yourself, outside of mergemaster.
Also, whenever you do change anything in /etc, make sure you don't
remove the $FreeBSD:...$ version info line. Mergemaster uses this
to skip files whos version hasn't changed, even if they differ,
making the process much easier and safer. Also, if you do merge
files by hand...make sure you update the $FreeBSD info line to match
the new version...or the next upgrade will confuse mergemaster.
--
BSD: A psychoactive drug, popular in the 80s, probably developed at UC
Berkeley or thereabouts. Similar in many ways to the prescription-only
medication called "System V", but infinitely more useful. (Or, at least,
more fun.) The full chemical name is "Berkeley Standard Distribution".