From owner-freebsd-stable Sun Oct 13 10:41:19 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60C2137B401 for ; Sun, 13 Oct 2002 10:41:18 -0700 (PDT) Received: from white.gradwell.net (white.gradwell.net [195.149.39.57]) by mx1.FreeBSD.org (Postfix) with SMTP id 3637843E77 for ; Sun, 13 Oct 2002 10:41:17 -0700 (PDT) (envelope-from aw1@stade.co.uk) Received: (qmail 90065 invoked from network); 13 Oct 2002 17:41:16 -0000 Received: from public1-stok1-5-cust38.manc.broadband.ntl.com (HELO access2.hanley.stade.co.uk) (213.106.97.38) by pop3.gradwell.net with SMTP; 13 Oct 2002 17:41:16 -0000 Received: from titus.hanley.stade.co.uk (titus [192.168.1.5]) by access2.hanley.stade.co.uk (8.12.6/8.12.6) with ESMTP id g9DHfG0w002730; Sun, 13 Oct 2002 18:41:16 +0100 (BST) (envelope-from aw1@titus.hanley.stade.co.uk) Received: from titus.hanley.stade.co.uk (localhost [127.0.0.1]) by titus.hanley.stade.co.uk (8.12.6/8.12.6) with ESMTP id g9DHfFEa020685; Sun, 13 Oct 2002 18:41:15 +0100 (BST) (envelope-from aw1@titus.hanley.stade.co.uk) Received: (from aw1@localhost) by titus.hanley.stade.co.uk (8.12.6/8.12.6/Submit) id g9DHf5Nj020684; Sun, 13 Oct 2002 18:41:05 +0100 (BST) (envelope-from aw1) Date: Sun, 13 Oct 2002 18:41:05 +0100 From: Adrian Wontroba To: Trish Lynch Cc: freebsd-stable@FreeBSD.ORG Subject: mergemaster (was Re: Ifconfig config of gif tunnels) Message-ID: <20021013184105.A20385@titus.hanley.stade.co.uk> Reply-To: aw1@stade.co.uk Mail-Followup-To: Adrian Wontroba , Trish Lynch , freebsd-stable@FreeBSD.ORG References: <20021013172810.A19177@titus.hanley.stade.co.uk> <20021013130138.G523-100000@femme.sapphite.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i In-Reply-To: <20021013130138.G523-100000@femme.sapphite.org>; from trish@bsdunix.net on Sun, Oct 13, 2002 at 01:05:27PM -0400 X-Operating-System: FreeBSD 4.7-STABLE Organization: Yes, I need some of that. X-Phone: +(44) 1782 207338 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Oct 13, 2002 at 01:05:27PM -0400, Trish Lynch wrote: > I';ve done something semi-simple to manage things that possibly might get > broken by mergemaster. I don't recall ever having anything broken by mergemaster. I have broken things for myself by failing to drive mergemaster properly, e.g. my not noticing that a file (i)nstalled by mergemaster should have been (m)erged, to preserve local changes. The incidence of this has much reduced since I adopted the convention of flagging files I have modified with a "# **** MODIFIED ****" line near the top. -- Adrian Wontroba To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message