[cvsnt] vedprakash.patel at gmail.com

[Bo Berglund]

You have not read up on the way CVS works...

Apparently you have now the following revisions in the server:
1.1
1.2
1.3
1.4
1.5

You have retrieved an old revision (1.2) from the server, which places a
local "sticky" tag on the file.
This makes it impossible to commit any changes you make to the file,
because all commits must be based on the HEAD revision (in your case
1.5) and will create a new revision in the server (1.6).
Basically 1.2 is old history and you cannot change history in CVS...

So what can you do? Well, it depends on what you are after!

1) You can create a branch from the 1.2 revision and then update to that
branch and commit.
This will make it possible to store your edits into CVS but they will
only be available on the branch itself. The HEAD revision will still be
1.5.

2) You can go on from the first step and merge the new branch into TRUNK
and then commit the result.
This puts the edits you did to 1.2 *PLUS* the edits that have been done
between 1.2 and  1.5 into the final 1.6 revision.

But if all you want to do is to replace the HEAD revision (1.5) with
your edited 1.2 revision then I suggest you do as follows:

- Copy the file you have edited to another location.
- Update from CVS and set the update to remove sticky tags, this brings
you 1.5
- Now copy back the edited 1.2 file and overwrite the existing file
- Finally make a cvs commit, this creates a new revision 1.6 that is
exactly the file you created by editing 1.2.


Best regards,

Bo Berglund


-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf
Of Ved Patel
Sent: den 12 juni 2007 14:33
To: cvsnt at cvsnt.org
Subject: [cvsnt] vedprakash.patel at gmail.com

Hi,



            I am facing issue with stick tag, while committing the
changes
in repository. I have 5 versions on a file "file1.txt". the latest
version
is 1.5.  I have taken older version i.e. 1.2 from the repository using
the
below command and edited the file

** update -r 1.2 file1.txt

** edit file1.txt

I have made some changes and tryp to commit then I get error message as

cvs server: sticky tag `1.2' for file `file1.txt' is not a branch

cvs [server aborted]: correct above errors first!



Please help me to resolve this issue. I have tried below commands but no
luck.

 commit -r1.2 -m "test" file1.txt



Thanks,

Ved
_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt