From owner-freebsd-stable@FreeBSD.ORG Sat Oct 25 14:40:00 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 680D51065672 for ; Sat, 25 Oct 2008 14:40:00 +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 222D08FC25 for ; Sat, 25 Oct 2008 14:39:59 +0000 (UTC) (envelope-from freebsd-stable@m.gmane.org) Received: from list by ciao.gmane.org with local (Exim 4.43) id 1KtkIy-0005b6-5u for freebsd-stable@freebsd.org; Sat, 25 Oct 2008 14:39:52 +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 ; Sat, 25 Oct 2008 14:39:52 +0000 Received: from gamato by 200.41.broadband11.iol.cz with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 25 Oct 2008 14:39:52 +0000 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-stable@freebsd.org From: martinko Date: Sat, 25 Oct 2008 16:39:41 +0200 Lines: 35 Message-ID: References: <200810211350.m9LDo0Js077761@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: <200810211350.m9LDo0Js077761@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: Sat, 25 Oct 2008 14:40:00 -0000 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. 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 >