From owner-freebsd-bugs Tue Jan 23 6:36: 4 2001 Delivered-To: freebsd-bugs@freebsd.org Received: from hand.dotat.at (sfo-gw.covalent.net [207.44.198.62]) by hub.freebsd.org (Postfix) with ESMTP id B1C2037B6A5; Tue, 23 Jan 2001 06:35:46 -0800 (PST) Received: from fanf by hand.dotat.at with local (Exim 3.20 #1) id 14L4Xu-000PEA-00; Tue, 23 Jan 2001 14:35:42 +0000 Date: Tue, 23 Jan 2001 14:35:42 +0000 From: Tony Finch To: gnats-admin@FreeBSD.org, freebsd-bugs@FreeBSD.org Subject: Re: bin/24564: local ident strings interfere with mergemaster Message-ID: <20010123143542.T92905@hand.dotat.at> References: <200101222330.f0MNU2X11397@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200101222330.f0MNU2X11397@freefall.freebsd.org> Organization: Covalent Technologies, Inc Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Regarding Peter Pentchev's comments about this bug, and Doug Barton's comment on the current way mergemaster handles things: `cvs status` is no good because if the files get away from their CVS directories you lose easy access to the revision information. (I don't have a CVS directory in /etc). My patch is designed to restore old functionality whilst still accommodating the requirement for portability. Tony. -- f.a.n.finch fanf@covalent.net dot@dotat.at "Then they attacked a town. A small town, I'll admit. But nevertheless a town of people. People who died." To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message