info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: pvcs to cvs and magic branches


From: Greg A. Woods
Subject: Re: pvcs to cvs and magic branches
Date: Thu, 12 Jul 2001 22:32:30 -0400 (EDT)

[ On Thursday, July 12, 2001 at 17:00:41 (-0700), Jim Gallagher wrote: ]
> Subject: Re: pvcs to cvs and magic branches
>
> I'm sorry, but I still don't understand. What would be affected in CVS if odd 
> numbered branches were created during the conversion from PVCS? Would I not 
> be able to get working copies or commit? Is this a 'dusty corner' that I 
> probably will not need to know about?

Well, I'm not so sure actually....  It's probably OK.

I think that if the branches already exist in RCS files that are put
into a CVS repository then everything works OK.  At least I seem to
remember people saying as much here, based on copying existing RCS
repositories into a CVS repository.  I don't rememeber any reports of
people actually continuing to use existing branches with CVS, but I may
be forgetting the details.

If I'm not mistaken the "magic" part of an CVS branch number is not that
it's an even number, but rather that it ends in ".0.2".

This would tend to suggest that there may be problems with adding and
removing files on branches, but provided that you have a tag pointing at
the RCS branch number, and that there are actually deltas on that RCS
branch in every file, then you should be able to check out the branch
and make commits to files on that branch.

Indeed a tiny test with a manually created single file with a single RCS
branch shows this will work OK.  I'll leave it to you to test adding a
file on a branch, removing a file on a branch, etc., if you think such
actions will be important to your future use....

[[ I've omitted the steps where I created hello.c,v ]]

$ rlog hello.c             

RCS file: hello.c,v
Working file: hello.c
head: 1.3
branch:
locks: strict
access list:
symbolic names:
        WHAT: 1.2.1
keyword substitution: kv
total revisions: 4;     selected revisions: 4
description:
----------------------------
revision 1.3
date: 2001/07/13 02:20:43;  author: woods;  state: Exp;  lines: +2 -1
more newlines
----------------------------
revision 1.2
date: 2001/07/13 02:20:18;  author: woods;  state: Exp;  lines: +3 -1
branches:  1.2.1;
newlines
----------------------------
revision 1.1
date: 2001/07/13 02:19:46;  author: woods;  state: Exp;
Initial revision
----------------------------
revision 1.2.1.1
date: 2001/07/13 02:21:31;  author: woods;  state: Exp;  lines: +1 -1
what's up?
=============================================================================
$ mkdir /cvs/testb
$ cp hello.c,v /cvs/testb                                         
$ cd ..
$ cvs co -rWHAT testb
cvs checkout: Updating testb
U testb/hello.c
$ cd testb
$ cvs status
cvs status: Examining .
===================================================================
File: hello.c           Status: Up-to-date

   Working revision:    1.2.1.1 Fri Jul 13 02:21:31 2001
   Repository revision: 1.2.1.1 /cvs/testb/hello.c,v
   Sticky Tag:          WHAT (branch: 1.2.1)
   Sticky Date:         (none)
   Sticky Options:      (none)

$ vi hello.c                                                      
$ cvs ci -m 'test commit from cvs' hello.c 
Checking in hello.c;
/cvs/testb/hello.c,v  <--  hello.c
new revision: 1.2.1.2; previous revision: 1.2.1.1
done
$ cvs status 
cvs status: Examining .
===================================================================
File: hello.c           Status: Up-to-date

   Working revision:    1.2.1.2 Fri Jul 13 02:23:57 2001
   Repository revision: 1.2.1.2 /cvs/testb/hello.c,v
   Sticky Tag:          WHAT (branch: 1.2.1)
   Sticky Date:         (none)
   Sticky Options:      (none)

$ cvs log hello.c                                                 

RCS file: /cvs/testb/hello.c,v
Working file: hello.c
head: 1.3
branch:
locks: strict
access list:
symbolic names:
        WHAT: 1.2.1
keyword substitution: kv
total revisions: 5;     selected revisions: 5
description:
----------------------------
revision 1.3
date: 2001/07/13 02:20:43;  author: woods;  state: Exp;  lines: +2 -1
more newlines
----------------------------
revision 1.2
date: 2001/07/13 02:20:18;  author: woods;  state: Exp;  lines: +3 -1
branches:  1.2.1;
newlines
----------------------------
revision 1.1
date: 2001/07/13 02:19:46;  author: woods;  state: Exp;
Initial revision
----------------------------
revision 1.2.1.2
date: 2001/07/13 02:24:22;  author: woods;  state: Exp;  lines: +1 -1
test commit from cvs
----------------------------
revision 1.2.1.1
date: 2001/07/13 02:21:31;  author: woods;  state: Exp;  lines: +1 -1
what's up?
=============================================================================
$ cd ..
$ cvs release -d testb
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `testb': yes
$ cvs co -rWHAT testb    
cvs checkout: Updating testb
U testb/hello.c
$ cd testb
$ cvs status hello.c
===================================================================
File: hello.c           Status: Up-to-date

   Working revision:    1.2.1.2 Fri Jul 13 02:24:22 2001
   Repository revision: 1.2.1.2 /cvs/testb/hello.c,v
   Sticky Tag:          WHAT (branch: 1.2.1)
   Sticky Date:         (none)
   Sticky Options:      (none)

$ 

-- 
                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]