Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Jun 1997 11:24:18 +0200 (SAT)
From:      John Hay <jhay@mikom.csir.co.za>
To:        jhay@zibbi.mikom.csir.co.za (jhay)
Cc:        hackers@freebsd.org
Subject:   Re: cvs fails on 2.2 branch of natd
Message-ID:  <199706250924.LAA05752@zibbi.mikom.csir.co.za>
In-Reply-To: From jhay at "Jun 25, 97 10:21:16 am"

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199706250924.LAA05752>