From owner-freebsd-hackers  Wed Jun 25 02:24:34 1997
Return-Path: <owner-hackers>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id CAA12816
          for hackers-outgoing; Wed, 25 Jun 1997 02:24:34 -0700 (PDT)
Received: from zibbi.mikom.csir.co.za (zibbi.mikom.csir.co.za [146.64.24.58])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id CAA12810
          for <hackers@freebsd.org>; Wed, 25 Jun 1997 02:24:28 -0700 (PDT)
Received: (from jhay@localhost)
	by zibbi.mikom.csir.co.za (8.8.5/8.8.5) id LAA05752;
	Wed, 25 Jun 1997 11:24:18 +0200 (SAT)
From: John Hay <jhay@mikom.csir.co.za>
Message-Id: <199706250924.LAA05752@zibbi.mikom.csir.co.za>
Subject: Re: cvs fails on 2.2 branch of natd
In-Reply-To: From jhay at "Jun 25, 97 10:21:16 am"
To: jhay@zibbi.mikom.csir.co.za (jhay)
Date: Wed, 25 Jun 1997 11:24:18 +0200 (SAT)
Cc: hackers@freebsd.org
X-Mailer: ELM [version 2.4ME+ PL31 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-hackers@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

I have found the problem. For some reason cvsup have thrown things away.
On internat.freebsd.org (where I cvsup from) the piece of
usr.sbin/natd/Makefile,v looks like this:

-------
1.1
date    97.06.22.04.19.08;      author brian;   state Exp;
branches
        1.1.1.1
	1.1.2.1;
next    ;
------

But on my machine it looks like this:
-----
1.1
date     97.06.22.04.19.08;  author brian;  state Exp;
branches 1.1.1.11.1.2.1;
next     ;
-----

Is that because my cvsup is still 14.1.1?

> 
> Is it just me (or my cvs), but when I did a cvs update on the RELENG_2_2
> branch it failed in the usr.sbin/natd directory:
> 
> =======
> zibbi:/usr/src/usr.sbin/natd # cvs -q update 
> co: /FreeBSD/ncvs/src/usr.sbin/natd/Makefile,v:10: 1.1.1.11.1.2.1 isn't a delta number
> co aborted
> cvs update: could not check out Makefile
...
> =======

John
-- 
John Hay -- John.Hay@mikom.csir.co.za