Date: Mon, 27 Oct 2008 16:58:51 +0100 (CET) From: Oliver Fromme <olli@lurza.secnetix.de> To: freebsd-stable@FreeBSD.ORG, gamato@users.sf.net Subject: Re: easy way to upgrade from 6.3 to 7.1 (including port packages) Message-ID: <200810271558.m9RFwpnv019593@lurza.secnetix.de> In-Reply-To: <gdvb3h$rni$1@ger.gmane.org>
next in thread | previous in thread | raw e-mail | index | archive | help
martinko <gamato@users.sf.net> wrote: > Oliver Fromme wrote: > > martinko <gamato@users.sf.net> 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. Yes, You can. I've done it several times. And I'm sure I'm not hallucinating. :-) > 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) You only need -m if you have installed the source somewhere else than /usr/src. > it would try > to run make (1) which fails since there is no Makefile in my backup dir. :-( You have to it runs make(1) in /usr/src/etc (unless you override the path with -m) which contains a Makefile. If it doesn't, you haven't installed the system sources correctly. >From your description it sounds as if you used -m to point to your modified etc files. That's wrong. Please follow the instructions that I explained in my previous mail message. It works. As I said, I've done it plenty of times. Best regards Oliver -- Oliver Fromme, secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing b. M. Handelsregister: Registergericht Muenchen, HRA 74606, Geschäftsfuehrung: secnetix Verwaltungsgesellsch. mbH, Handelsregister: Registergericht Mün- chen, HRB 125758, Geschäftsführer: Maik Bachmann, Olaf Erb, Ralf Gebhart FreeBSD-Dienstleistungen, -Produkte und mehr: http://www.secnetix.de/bsd "The scanf() function is a large and complex beast that often does something almost but not quite entirely unlike what you desired." -- Chris Torek
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810271558.m9RFwpnv019593>