Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Aug 1999 00:58:11 -0700
From:      Doug <Doug@gorean.org>
To:        Christopher Hall <hsw@acm.org>
Cc:        freebsd-ports@FreeBSD.ORG, Doug Barton <Studded@gorean.org>
Subject:   Re: mergemaster - broken by change from $Id: to $FreeBSD:
Message-ID:  <37CA3993.5A1E1F04@gorean.org>
References:  <199908300608.OAA45921@hsw.generalresources.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?37CA3993.5A1E1F04>