[cvsnt] Updating from regular tag marks some dirs with stickybranch tag instead of regular tag
Macarascu Alexandru Cristian-AMACARA1
cristian.macarascu at freescale.com
Thu May 28 18:49:19 BST 2009
Hi!
I cannot recall the exact command, as I've used WinCVS GUI.
I've created a very short example that reproduced my problem (a module
with two subdirs, each with a single text file):
cvs -w -d :sspi:fsrcvs:/CVS/swmaint/team_repos import -I ! -I CVS -m
test -n -- sticky_tag_example
cvs -w -d :sspi:fsrcvs:/CVS/swmaint/team_repos checkout -P --
sticky_tag_example
cvs -w tag -- bld_1
cvs -w update -P -d -r bld_1
Looking into Tag files from each CVS/ directory in my sandbox, I can see
that both subdirs have the 'N' type, but the root directory has the 'T'
type.
If I try to add a file in a subdir (cvs -w add -- foo.c) I get 'cvs
server: cannot add file on non-branch tag bld_1'
But if I add a file in the root folder of the module (same cvs -w add --
foo.c) it says:
cvs server: scheduling file `foo.c' for addition on branch
`bld_1'
cvs server: use 'cvs commit' to add this file permanently
and when I commit, I have version 1.1.2.1 of my newly added foo.c file
on a branch called 'bld_1'.
Best regards,
Cristian.
The information contained in this email has been classified as:
( ) Freescale General Business Information
(X) Freescale Internal Use Only
( ) Freescale Confidential Proprietary
( ) Personal Memorandum
-----Original Message-----
From: Arthur Barrett [mailto:arthur.barrett at march-hare.com]
Sent: Wednesday, May 27, 2009 10:51 PM
To: cvsnt at cvsnt.org
Cc: Macarascu Alexandru Cristian-AMACARA1
Subject: RE: [cvsnt] Updating from regular tag marks some dirs with
stickybranch tag instead of regular tag
Cristian,
Please reply to the group not me personally.
> Thanks for replying! The problem is not related to files, but
> directories only.
>
> Actually we came across it simply because we checked out from a
> regular tag and, by mistake, added a new file to CVS control - and the
> results was that CVS server created a branch called like the regular
> tag and added the file on that branch.
>
> So, what I can give you are two Tag files from different directories,
> one showing T and the other N. Or is there another way I can help you
> to help me?
What was the EXACT command you used to add the file?
When I checkout a non-branch tag and try and add a file in an existing
directory I get this error:
cvsnt server: cannot add file on non-branch tag CVSNT_2_5_03_3309
Please reply to the group not me personally.
Regards,
Arthur Barrett
More information about the cvsnt
mailing list