mergemaster question

mergemaster question

Post by Arcadius A » Sat, 29 Sep 2001 16:42:20



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  ?

Thanks....

arcad.

 
 
 

mergemaster question

Post by Zeni » Sat, 29 Sep 2001 08:11:51



: 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".

 
 
 

mergemaster question

Post by Chris Kings-Lynn » Sat, 29 Sep 2001 11:50:23


To do a mergemaster:

1. If it's a config file you've never edited, install the temporary one
2. If it's a file you don't want touched (master.passwd, group, etc.) delete
the temporary file
3. If it's a file you've modified (say inetd.conf or ppp.conf), check the
changes and either install, merge or leave for later
  If you merge, remember that the left hand side is your existing config,
and the right hand side is the new

You pretty much want to get as much of the new config as possible into your
existing config.  ALWAYS read the /usr/src/UPDATING file as well!!!

Chris


Quote:> 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  ?

> Thanks....

> arcad.

 
 
 

1. mergemaster question

How do typical users use this program? I hope there's an relatively easy
answer since playing a seemingly endless game of checking diffs gets old
fast.

Any comments welcome.
Thanks

-----------== Posted via Newsfeeds.Com - Uncensored Usenet News ==----------
   http://www.newsfeeds.com       The #1 Newsgroup Service in the World!
-----= Over 100,000 Newsgroups - Ulimited Fast Downloads - 19 Servers =-----

2. Questions about Linux

3. mergemaster

4. Dlink DE-650 network card - experiences?

5. Can't ping router - but can route through it (after mergemaster)

6. Apt-RPM

7. mergemaster

8. How do I determine source of my login?

9. Anyone using mergemaster?

10. Mergemaster - Do I NEED to merge delete or install those changes?

11. mergemaster

12. Installing over NFS (make installkernel, make installworld, mergemaster, ...)

13. mergemaster