Oliver Fromme wrote:
martinko <[EMAIL PROTECTED]> wrote:
> 1) I wonder if I could use mergemaster to compare 2 directories and
> merge differencies as neccessary. To explain: I have all config files I
> touch saved with full path somewhere in /root. And therefore I'd like
> mergemaster or some other tool to compare all files in my backup
> directory with newly installed (config) files.
You can use mergemaster against any directory, not just
/etc. This is especially useful when perforing a binary
update, a cross update or similar things.
No, you cannot.
I have all config files I edited saved with full path under my backup
directory and I would like to use mergemaster or something similar to
compare and merge my changes (perhaps from other machine). But if you
try to use mergemaster (you need to specify both -m and -D) it would try
to run make (1) which fails since there is no Makefile in my backup dir. :-(
For example, suppose you have a freshly installed system
(including /usr/src) with a virgin /etc directory, and
you've got a copy of an old etc directory (with local
modifications) in /root/etc.old. Then you can do this:
# mergemaster -D /root/etc.old
And all new things will be merged into /root/etc.old.
When you're done, simply copy /root/etc.old to /etc and
reboot. (You might want to keep a copy of the original
contents of the directory, just to be on the safe side.)
Best regards
Oliver
_______________________________________________
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
