Problems branching in CVS

info-cvs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Problems branching in CVS

From:	berry
Subject:	Problems branching in CVS
Date:	Thu, 05 Jul 2001 15:41:24 -0500
Larry,

I have started fresh with the branch attempts:

The following is a history of my cvs commands
that fail to extend a branch once created. I do
not know what I am doing wrong! I am attempting
to check out procedure clip 164.8 and branch
from that point.

I have the version I want to branch from checked out
in my directory berry/src/scripts/esproc/clip


cato:/users/721/berry/src/scripts/esproc/clip% cvs status
cvs status: Examining .
===================================================================
File: clip.c            Status: Up-to-date

   Working revision:    164.8   Wed Jun  4 15:14:17 1997
   Repository revision: 164.8   /cm/cvs/esproc/clip/clip.c,v
   Sticky Tag:          164.8
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: clip.h            Status: Up-to-date

   Working revision:    164.8   Wed Jun  4 15:14:17 1997
   Repository revision: 164.8   /cm/cvs/esproc/clip/clip.h,v
   Sticky Tag:          164.8
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: clip.nsd          Status: Up-to-date

   Working revision:    164.8   Wed Jun  4 15:14:17 1997
   Repository revision: 164.8   /cm/cvs/esproc/clip/clip.nsd,v
   Sticky Tag:          164.8
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: makefile          Status: Up-to-date

   Working revision:    164.8   Wed Jun  4 15:14:17 1997
   Repository revision: 164.8   /cm/cvs/esproc/clip/makefile,v
   Sticky Tag:          164.8
   Sticky Date:         (none)
   Sticky Options:      (none)

cato:/users/721/berry/src/scripts/esproc/clip%

Now I create a "sticky tag" to branch from.
cato:/users/721/berry/src/scripts/esproc/clip% cvs tag -b daves_takeoff_point
cvs tag: Tagging .
T clip.c
T clip.h
T clip.nsd
T makefile
cato:/users/721/berry/src/scripts/esproc/clip%


Now I need to check out the source with this "sticky tag"

cato:/users/721/berry/src/scripts% cvs co -r daves_takeoff_point esproc/clip
cvs checkout: Updating esproc/clip
cato:/users/721/berry/src/scripts% cd esproc/clip
cato:/users/721/berry/src/scripts/esproc/clip% cvs status
cvs status: Examining .
===================================================================
File: clip.c            Status: Up-to-date

   Working revision:    164.8   Wed Jun  4 15:14:17 1997
   Repository revision: 164.8   /cm/cvs/esproc/clip/clip.c,v
   Sticky Tag:          daves_takeoff_point (branch: 164.8.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: clip.h            Status: Up-to-date

   Working revision:    164.8   Wed Jun  4 15:14:17 1997
   Repository revision: 164.8   /cm/cvs/esproc/clip/clip.h,v
   Sticky Tag:          daves_takeoff_point (branch: 164.8.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: clip.nsd          Status: Up-to-date

   Working revision:    164.8   Wed Jun  4 15:14:17 1997
   Repository revision: 164.8   /cm/cvs/esproc/clip/clip.nsd,v
   Sticky Tag:          daves_takeoff_point (branch: 164.8.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: makefile          Status: Up-to-date

   Working revision:    164.8   Wed Jun  4 15:14:17 1997
   Repository revision: 164.8   /cm/cvs/esproc/clip/makefile,v
   Sticky Tag:          daves_takeoff_point (branch: 164.8.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

cato:/users/721/berry/src/scripts/esproc/clip%


Now I make changes to all files in the source set
and try to check in the branch.

cato:/users/721/berry/src/scripts% cvs commit esproc/clip
cvs commit: Examining esproc/clip
Checking in esproc/clip/clip.c;
/cm/cvs/esproc/clip/clip.c,v  <--  clip.c
new revision: 164.8.2.1; previous revision: 164.8
done
Checking in esproc/clip/clip.h;
/cm/cvs/esproc/clip/clip.h,v  <--  clip.h
new revision: 164.8.2.1; previous revision: 164.8
done
Checking in esproc/clip/clip.nsd;
/cm/cvs/esproc/clip/clip.nsd,v  <--  clip.nsd
new revision: 164.8.2.1; previous revision: 164.8
done
Checking in esproc/clip/makefile;
/cm/cvs/esproc/clip/makefile,v  <--  makefile
new revision: 164.8.2.1; previous revision: 164.8
done
cato:/users/721/berry/src/scripts%


Now I check out the branched version just created:
.
.
cato:/users/721/berry/src/scripts% cvs co -r 164.8.2.1 esproc/clip
cvs checkout: Updating esproc/clip
cato:/users/721/berry/src/scripts% cato:/users/721/berry/src/scripts% cd 
esproc/clip
cato:/users/721/berry/src/scripts/esproc/clip% cvs status
cvs status: Examining .
===================================================================
File: clip.c            Status: Up-to-date

   Working revision:    164.8.2.1       Thu Jul  5 20:18:26 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/clip.c,v
   Sticky Tag:          164.8.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: clip.h            Status: Up-to-date

   Working revision:    164.8.2.1       Thu Jul  5 20:18:28 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/clip.h,v
   Sticky Tag:          164.8.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: clip.nsd          Status: Up-to-date

   Working revision:    164.8.2.1       Thu Jul  5 20:18:28 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/clip.nsd,v
   Sticky Tag:          164.8.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: makefile          Status: Up-to-date

   Working revision:    164.8.2.1       Thu Jul  5 20:18:29 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/makefile,v
   Sticky Tag:          164.8.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

cato:/users/721/berry/src/scripts/esproc/clip%



Now I make changes to all files in the source set again
and try to extend the branch:


cato:/users/721/berry/src/scripts% cvs commit esproc/clip
cvs commit: Examining esproc/clip
cvs commit: sticky tag `164.8.2.1' for file `esproc/clip/clip.c' is not a branch
cvs commit: sticky tag `164.8.2.1' for file `esproc/clip/clip.h' is not a branch
cvs commit: sticky tag `164.8.2.1' for file `esproc/clip/clip.nsd' is not a 
branch
cvs commit: sticky tag `164.8.2.1' for file `esproc/clip/makefile' is not a 
branch
cvs [commit aborted]: correct above errors first!
cato:/users/721/berry/src/scripts%

cato:/users/721/berry/src/scripts/esproc/clip% cvs status -v
cvs status: Examining .
===================================================================
File: clip.c            Status: Locally Modified

   Working revision:    164.8.2.1       Thu Jul  5 20:18:26 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/clip.c,v
   Sticky Tag:          164.8.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        daves_takeoff_point             (branch: 164.8.2)
        R200                            (revision: 200.10)
        R170                            (revision: 170.9)
        TEST01                          (revision: 164.8)
        R163                            (revision: 156.2)
        R156                            (revision: 156.2)

===================================================================
File: clip.h            Status: Locally Modified

   Working revision:    164.8.2.1       Thu Jul  5 20:18:28 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/clip.h,v
   Sticky Tag:          164.8.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        daves_takeoff_point             (branch: 164.8.2)
        R200                            (revision: 200.10)
        R170                            (revision: 170.9)
        TEST01                          (revision: 164.8)
        R163                            (revision: 156.2)
        R156                            (revision: 156.2)

===================================================================
File: clip.nsd          Status: Locally Modified

   Working revision:    164.8.2.1       Thu Jul  5 20:18:28 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/clip.nsd,v
   Sticky Tag:          164.8.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        daves_takeoff_point             (branch: 164.8.2)
        R200                            (revision: 200.10)
        R170                            (revision: 170.9)
        TEST01                          (revision: 164.8)
        R163                            (revision: 156.2)
        R156                            (revision: 156.2)

===================================================================
File: makefile          Status: Locally Modified

   Working revision:    164.8.2.1       Thu Jul  5 20:18:29 2001
   Repository revision: 164.8.2.1       /cm/cvs/esproc/clip/makefile,v
   Sticky Tag:          164.8.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        daves_takeoff_point             (branch: 164.8.2)
        R200                            (revision: 200.10)
        R170                            (revision: 170.9)
        TEST01                          (revision: 164.8)
        R163                            (revision: 156.2)
        R156                            (revision: 156.2)

cato:/users/721/berry/src/scripts/esproc/clip% 




The branch will not grow! I am stumped (no pun intended!)

Regards,
David Berry
[Prev in Thread]
Current Thread
[Next in Thread]
Problems branching in CVS, berry <=
- Re: Problems branching in CVS, Larry Jones, 2001/07/05
  - Re: Problems branching in CVS, berry, 2001/07/05
    - Re: Problems branching in CVS, Larry Jones, 2001/07/05
    - Re: Problems branching in CVS, Eric Siegerman, 2001/07/06
Prev by Date: Re: Verification & Validation of CVS
Next by Date: Re: Problems branching in CVS
Previous by thread: Verification & Validation of CVS
Next by thread: Re: Problems branching in CVS
Index(es):
- Date
- Thread