From owner-freebsd-stable@FreeBSD.ORG Mon Oct 27 15:58:54 2008 Return-Path: Delivered-To: freebsd-stable@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DFAE81065672 for ; Mon, 27 Oct 2008 15:58:54 +0000 (UTC) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (unknown [IPv6:2a01:170:102f::2]) by mx1.freebsd.org (Postfix) with ESMTP id 5AAB78FC13 for ; Mon, 27 Oct 2008 15:58:54 +0000 (UTC) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (localhost [127.0.0.1]) by lurza.secnetix.de (8.14.3/8.14.3) with ESMTP id m9RFwpGD019594; Mon, 27 Oct 2008 16:58:52 +0100 (CET) (envelope-from oliver.fromme@secnetix.de) Received: (from olli@localhost) by lurza.secnetix.de (8.14.3/8.14.3/Submit) id m9RFwpnv019593; Mon, 27 Oct 2008 16:58:51 +0100 (CET) (envelope-from olli) Date: Mon, 27 Oct 2008 16:58:51 +0100 (CET) Message-Id: <200810271558.m9RFwpnv019593@lurza.secnetix.de> From: Oliver Fromme To: freebsd-stable@FreeBSD.ORG, gamato@users.sf.net In-Reply-To: X-Newsgroups: list.freebsd-stable User-Agent: tin/1.8.3-20070201 ("Scotasay") (UNIX) (FreeBSD/6.4-PRERELEASE-20080904 (i386)) MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2 (lurza.secnetix.de [127.0.0.1]); Mon, 27 Oct 2008 16:58:52 +0100 (CET) Cc: Subject: Re: easy way to upgrade from 6.3 to 7.1 (including port packages) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-stable@FreeBSD.ORG, gamato@users.sf.net List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Oct 2008 15:58:55 -0000 martinko wrote: > Oliver Fromme wrote: > > martinko 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