From owner-freebsd-current  Sun Aug 29 19:29:50 1999
Delivered-To: freebsd-current@freebsd.org
Received: from wall.polstra.com (rtrwan160.accessone.com [206.213.115.74])
	by hub.freebsd.org (Postfix) with ESMTP id 861BB150E9
	for <current@freebsd.org>; Sun, 29 Aug 1999 19:29:45 -0700 (PDT)
	(envelope-from jdp@polstra.com)
Received: from vashon.polstra.com (vashon.polstra.com [206.213.73.13])
	by wall.polstra.com (8.9.3/8.9.1) with ESMTP id TAA03250;
	Sun, 29 Aug 1999 19:27:54 -0700 (PDT)
	(envelope-from jdp@polstra.com)
From: John Polstra <jdp@polstra.com>
Received: (from jdp@localhost)
	by vashon.polstra.com (8.9.3/8.9.1) id TAA09745;
	Sun, 29 Aug 1999 19:27:54 -0700 (PDT)
	(envelope-from jdp@polstra.com)
Date: Sun, 29 Aug 1999 19:27:54 -0700 (PDT)
Message-Id: <199908300227.TAA09745@vashon.polstra.com>
To: street@iname.com
Subject: Re: $FreeBSD tag confusion
In-Reply-To: <87zoza2kxf.fsf@mired.eh.local>
References: <87zoza2kxf.fsf@mired.eh.local>
Organization: Polstra & Co., Seattle, WA
Cc: current@freebsd.org
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

In article <87zoza2kxf.fsf@mired.eh.local>,
Kevin Street  <street@iname.com> wrote:
> I'm confused by what I'm seeing in my source tree after the
> Id->FreeBSD tag change.  I cvsup the repository and then update my
> source tree locally.  Most of the files in the tree now have an
> unexpanded $FreeBSD$ tag in them (ie. no version info).  Files which
> have been changed since the new tag went in get an expanded $FreeBSD:
> tag, but the version in the tag is not the same version as the checked 
> out file should be.  The contents of the file seem to really be the
> latest version though, other than the tag.
> 
> For example in /usr/src/sys/miscfs/umapfs "cvs status umap.h" gives:
> ===================================================================
> File: umap.h            Status: Up-to-date
>                                                                                 
>   Working revision:    1.11    Sun Aug 29 19:31:44 1999
>   Repository revision: 1.11    ...
> 
> but in the file I see:
>  * $FreeBSD: src/sys/miscfs/umapfs/umap.h,v 1.10 1999/08/28 00:47:00 peter Exp $
> 
> so the $FreeBSD tag in the file is one version behind the version of
> the currently checked out file.  Deleting and doing "cvs up umap.h"
> leaves me in the same state.
> 
> Any explanations as to what's going on?

The tags are expanding just fine up here in Seattle. :-)

I wish you would have included the rest of the output from your cvs
status command.  It sounds a lot like your source tree was checked
out with "-ko".  That would show up in the "Sticky Tag" line of your
cvs status output.

Do another cvs update, but this time add the "-A" flag:

    cvs update -A umap.h

If that fixes it, then you'd better do the same thing to the rest of
your source tree:

    cd /usr/src
    cvs update -APd

John
-- 
  John Polstra                                               jdp@polstra.com
  John D. Polstra & Co., Inc.                        Seattle, Washington USA
  "No matter how cynical I get, I just can't keep up."        -- Nora Ephron


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message