Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Dec 1998 23:48:15 +1000 (EST)
From:      "Michael Henry" <mhenry@white.ug.cs.usyd.edu.au>
To:        freebsd-questions@FreeBSD.ORG
Subject:   cvsupping secure collections
Message-ID:  <199812051248.EAA08789@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help
My apologies if this appears twice on the mailing list.
I mailed it ten hours ago through DejaNews and it still hasn't
shown up. Anyway...

	Last night I tried cvsupping the secure parts of my repository from
cvsup.internat.FreeBSD.org, with the following results:

	.
	.
	.
 Edit src/eBones/usr.sbin/ext_srvtab/ext_srvtab.c,v -> Attic
  Delete tag EBONES_KRB4 -> 1.1.1
  Delete tag ebones -> 1.1.1.1
  Delete tag peter_before_cleanups -> 1.4
  Delete tag RELENG_2_1_0_NEW_BP -> 1.4
  Delete tag RELENG_2_1_0 -> 1.4.0.2
  Delete tag RELENG_2_1_0_RELEASE -> 1.4
  Delete tag RELENG_2_1_5_RELEASE -> 1.4
  Delete tag RELENG_2_2_BP -> 1.4
  Delete tag RELENG_2_2 -> 1.4.0.4
  Delete tag RELENG_2_1_6_RELEASE -> 1.4
  Delete tag RELENG_2_1_6_1_RELEASE -> 1.4
  Delete tag RELENG_2_1_7_RELEASE -> 1.4
  Delete tag RELENG_2_2_0_RELEASE -> 1.4
  Delete tag RELENG_2_2_1_RELEASE -> 1.4
  Delete tag RELENG_2_2_2_RELEASE -> 1.4
  Delete tag RELENG_2_2_5_RELEASE -> 1.4
  Delete tag RELENG_2_2_6_RELEASE -> 1.4.4.1
  Add tag piero -> 1.1.1
  Add tag k4 -> 1.1.1.1
  Add tag KRB_1_X -> 1.2.0.2
  Add tag Rabson_1 -> 1.2
  Add tag FREEFALL_2_0_INITIAL -> 1.2
  Add tag AUG25 -> 1.3
  Add tag RELENG_2_1_0_BP -> 1.4
  Add tag RELENG_2_1_0 -> 1.4.0.2
  Add tag RELENG_2_1_0_RELEASE -> 1.4
  Add tag RELENG_2_1_5_RELEASE -> 1.4
  Add tag RELENG_2_2_BP -> 1.4
  Add tag RELENG_2_2 -> 1.4.0.4
  Add tag RELENG_2_1_6_RELEASE -> 1.4
  Add tag RELENG_2_1_6_1_RELEASE -> 1.4
  Add tag RELENG_2_1_7_RELEASE -> 1.4
  Add tag RELENG_2_2_0_RELEASE -> 1.4
  Add tag RELENG_2_2_1_RELEASE -> 1.4
  Add tag RELENG_2_2_2_RELEASE -> 1.4
  Add tag RELENG_2_2_5_RELEASE -> 1.4
  Delete delta 1.7
  Delete delta 1.6
  Delete delta 1.5
  Delete delta 1.4
Updater failed: src/eBones/usr.sbin/ext_srvtab/ext_srvtab.c,v: Error
deleting delta: 292: Attempt to delete delta (1.4) with branches

I assume from the following lines that delta 1.4 actually does have branches
(whatever that means):

1.4
date    95.09.07.21.36.49;      author markm;   state Exp;
branches
        1.4.4.1;
next    1.3;

and line 292 (where cvsup falls over) of that file is this:

    288  *      $FreeBSD$
    289 d11 1   
    290 a11 1   
    291 "$FreeBSD$";
    292 @       
    293         
    294         
    295 1.4     
    296 log     
    297 @Major cleanup of eBones code: 

So my question is: What's going on here?

I get the feeling that I'm updating my repository from a repository that is
older than mine. Surely this can't be!

Any ideas would be appreciated,

        Michael



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



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