From owner-freebsd-ports Mon Aug 30 0:58:33 1999 Delivered-To: freebsd-ports@freebsd.org Received: from dt011n65.san.rr.com (dt010nb9.san.rr.com [204.210.12.185]) by hub.freebsd.org (Postfix) with ESMTP id D17AA14F09 for ; Mon, 30 Aug 1999 00:58:27 -0700 (PDT) (envelope-from Doug@gorean.org) Received: from gorean.org (master [10.0.0.2]) by dt011n65.san.rr.com (8.9.3/8.8.8) with ESMTP id AAA01566; Mon, 30 Aug 1999 00:58:11 -0700 (PDT) (envelope-from Doug@gorean.org) Message-ID: <37CA3993.5A1E1F04@gorean.org> Date: Mon, 30 Aug 1999 00:58:11 -0700 From: Doug Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.6 [en] (Win98; I) X-Accept-Language: en MIME-Version: 1.0 To: Christopher Hall Cc: freebsd-ports@FreeBSD.ORG, Doug Barton Subject: Re: mergemaster - broken by change from $Id: to $FreeBSD: References: <199908300608.OAA45921@hsw.generalresources.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Christopher Hall wrote: > > I just ran mergemaster and it modified almost every file in /etc > > noticed that almost every file has been changed e.g.: > > # $FreeBSD: /cvs/src/etc/aliases,v 1.8.2.2 1999/08/29 14:18:37 peter Exp $ > > Previous was: > > # $Id: aliases,v 1.8.2.1 1999/02/09 15:07:12 des Exp $ > > a re-run of mergemaster does not recognise the version numbers. There is a version of mergemaster that does at http://freebsd.simplenet.com/mergemaster-1.25. I'm not ready to re-roll the port, although since this change was committed to -Stable too looks like that's going to take top priority for now. > I have mergemaster-1.24 and cvsup-bin-16.0 > > Is this change from $Id: to $FreeBSD: a permanent change? Yes. If you're going to run -Stable or -Current you must subscribe to and read the matching mailing list, and the cvs commit list. Good luck, Doug To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message