Forum OpenACS Development: Re: cvs woes

Collapse
12: Re: cvs woes (response to 11)
Posted by tammy m on
Hi again Russell,

First let me say that this really sucks and I just hate it. There I got that out. Funny but I don't feel better. I really appreciate your help on this. I know I wouldn't be thinking about this if I didn't have to!

Here's a cvs stat against a locally modified file in my development working copy

[tammy@goodchild:forms] cvs stat standard.adp
===================================================================
File: standard.adp      Status: Up-to-date

   Working revision:    1.2     Fri Nov  7 19:27:23 2003
   Repository revision: 1.2     /cvsroot/openacs/packages/acs-templating/resources/forms/standard.adp,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
and a cvs stat of a file modified on the release-2003-11-18 branch
[tammy@goodchild:forms] cvs stat standard.adp 
===================================================================
File: standard.adp      Status: Up-to-date

   Working revision:   1.1.1.1.2.1     Wed Dec  3 02:30:29 2003
   Repository revision: 1.1.1.1.2.1     /cvsroot/openacs/packages/acs-templating/resources/forms/standard.adp,v
   Sticky Tag:          release-2003-11-18__branch (branch: 1.1.1.1.2)
   Sticky Date:         (none)
   Sticky Options:      -kk
So it looks like maybe I am working off the trunk but my release branch somehow got made off the vendor branch?

So maybe I have this?

-------------------- trunk (active development)
    \
     \-------------- vendor branch (imports)
              \
               \------ release-2003-11-18 (release)
This is how I created the release branch though...
	cd $OACS_DEV_ROOT 
	cvs tag release-2003-11-18__root
	cvs tag -r release-2003-11-18__root -b release-2003-11-18__branch

	cd $OACS_TEST_ROOT
	cd ..
	cvs -q checkout -P -kk -r release-2003-11-18__branch -d or-test openacs

Have to think about what to do now. Reading more on branches and numbering so I can understand what is really going on here versus what should be going on here... :( Fogel makes nice bedtime reading...

much thanks and metta:)