From owner-freebsd-stable@FreeBSD.ORG Mon Oct 27 18:26:15 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 6740E1065673 for ; Mon, 27 Oct 2008 18:26:15 +0000 (UTC) (envelope-from freebsd-stable@m.gmane.org) Received: from ciao.gmane.org (main.gmane.org [80.91.229.2]) by mx1.freebsd.org (Postfix) with ESMTP id E28788FC0A for ; Mon, 27 Oct 2008 18:26:14 +0000 (UTC) (envelope-from freebsd-stable@m.gmane.org) Received: from list by ciao.gmane.org with local (Exim 4.43) id 1KuWn7-0002BW-2B for freebsd-stable@freebsd.org; Mon, 27 Oct 2008 18:26:13 +0000 Received: from 200.41.broadband11.iol.cz ([90.178.41.200]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 27 Oct 2008 18:26:13 +0000 Received: from gamato by 200.41.broadband11.iol.cz with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 27 Oct 2008 18:26:13 +0000 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-stable@freebsd.org From: martinko Date: Mon, 27 Oct 2008 19:26:03 +0100 Lines: 57 Message-ID: References: <200810271558.m9RFwpnv019593@lurza.secnetix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 200.41.broadband11.iol.cz User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.8.1.17) Gecko/20081009 SeaMonkey/1.1.12 In-Reply-To: <200810271558.m9RFwpnv019593@lurza.secnetix.de> Sender: news 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 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 18:26:15 -0000 Oliver Fromme wrote: > 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 > OK, it's obvious now that I didn't make myself clear enough. Sorry. :-) I'd like a more general purpose utility, be it mergemaster or sth else. I like the way mergemaster works but I'd like to use it not only for /etc (after make) -- I'd like to point it to my backup directory which doesn't contain all of /etc and compare the files it finds with those in /etc. Or point it to arbitrary 2 directories and compare their files. Cheers, Martin