From owner-freebsd-questions Sun Oct 21 12:46:27 2001 Delivered-To: freebsd-questions@freebsd.org Received: from rover.village.org (rover.bsdimp.com [204.144.255.66]) by hub.freebsd.org (Postfix) with ESMTP id 4BAE537B406; Sun, 21 Oct 2001 12:46:20 -0700 (PDT) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.11.3/8.11.3) with ESMTP id f9LJkIV40111; Sun, 21 Oct 2001 13:46:18 -0600 (MDT) (envelope-from imp@harmony.village.org) Received: from harmony.village.org (localhost [127.0.0.1]) by harmony.village.org (8.11.6/8.11.6) with ESMTP id f9LJkG754997; Sun, 21 Oct 2001 13:46:18 -0600 (MDT) (envelope-from imp@harmony.village.org) Message-Id: <200110211946.f9LJkG754997@harmony.village.org> To: Tim Bunce Subject: Re: mergemaster -- whats the best way? Cc: freebsd-questions@FreeBSD.ORG, freebsd-stable@FreeBSD.ORG In-reply-to: Your message of "Wed, 17 Oct 2001 11:18:01 BST." <20011017111801.E1560@dansat.data-plan.com> References: <20011017111801.E1560@dansat.data-plan.com> <001301c15671$6b2effe0$252da818@sioux> <5.1.0.14.0.20011016140751.02852dc8@pop.schulte.org> <20011016220800.B55640@dansat.data-plan.com> <20011016152927.0cc816e3.djb@unixan.com> Date: Sun, 21 Oct 2001 13:46:16 -0600 From: Warner Losh Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message <20011017111801.E1560@dansat.data-plan.com> Tim Bunce writes: : On Tue, Oct 16, 2001 at 05:57:14PM -0700, Gary W. Swearingen wrote: : > Daniel Brown writes: : > : > > Personally, I was thinking of hacking this feature into my own copies of : > > mergemaster some time in the medium future. =) : > : > I was thinking it would be good to somehow save copies of all installed : > config files (not just MD5s) and make it convenient to compare changes : > in the installed config files instead of comparing an installed file : > with my custom file. : : This would allow a three-way diff/merge which would be far better. Yes. I have a stupid script that does three way merging for me, but it is really really stupid and likely wouldn't work for others. The "install" step is a cvs diff -r V-installed -r V-repo-latest | patch to preserve local changes without the pain of the current merge process in mergemaster. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message