HELP!!! (was: Re: SCM update (was: [Biococoa-dev] Annotation))

[Charles PARNOT]

On the CVS web interface, your user file koen.pbproj looks like it has the MAIN and the HEAD tags, just like mine, and FOO is gone...

Did you try to checkout again now?? I also don't know if Xcode might be caching some stuff in your back and screwing things up?

charles


At 19:12 -0500 2/21/05, Koen van der Drift wrote:
>On Feb 21, 2005, at 6:54 PM, Charles PARNOT wrote:
>
>>It looks like you fixed it, right?
>>
>
>
>No, just trying out various cvs commands :(  What happened is that the branched version 1.1.1.2 has the tag 'MAIN', but the most recent version 1.16 has now a tag 'FOO', which I added by accident. The tag was 'REL_2' before that, so also not good. What needs to happen is that version 1.16 needs to be tagged 'MAIN', but everytime I try that I get an error:
>
>
>[koen at RubyTuesday:~/Documents/Development/Active Projects/BioCocoa/BioCocoa.pbproj] $ cvs tag -f MAIN koen.pbxuser
>W koen.pbxuser : MAIN already exists on branch 1.1.1.2 : NOT MOVING tag to version 1.16
>
>
>I can merge the two, but version 1.16 will keep the wrong tag.
>
>[koen at RubyTuesday:~/Documents/Development/Active Projects/BioCocoa/BioCocoa.pbproj] $ cvs -q update -j 1.16 -j 1.1.1.2 koen.pbxuser
>RCS file: /cvsroot/BioCocoa/BioCocoa.pbproj/koen.pbxuser,v
>retrieving revision 1.16
>retrieving revision 1.1.1.2
>Merging differences between 1.16 and 1.1.1.2 into koen.pbxuser
>[koen at RubyTuesday:~/Documents/Development/Active Projects/BioCocoa/BioCocoa.pbproj] $ cvs status koen.pbxuser
>===================================================================
>File: koen.pbxuser      Status: Locally Modified
>
>   Working revision:    1.16
>   Repository revision: 1.16   
>/cvsroot/BioCocoa/BioCocoa.pbproj/koen.pbxuser,v
>   Sticky Tag:          (none)
>   Sticky Date:         (none)
>   Sticky Options:      (none)
>
>
>
>Any ideas?
>
>
>- Koen.


-- 
Help science go fast forward:
http://cmgm.stanford.edu/~cparnot/xgrid-stanford/

Charles Parnot
charles.parnot at stanford.edu

Room  B157 in Beckman Center
279, Campus Drive
Stanford University
Stanford, CA 94305 (USA)

Tel +1 650 725 7754
Fax +1 650 725 8021