[cvsnt] cvs commit failing to create new version
Mark Victory
mark.victory at powervr.com
Wed May 12 17:15:53 BST 2004
Hello all,
I am having trouble with cvs commit not creating new versions of files but
claiming to have done so.
The following command sequence successfully creates a new file in the
repository
cvs add newfile.txt
cvs commit -m "message"
This file can be checked out fine, cvs update reports no new changes
afterwards, etc... However if I then edit my local copy of the file and
commit the changes, CVS returns with:
cvs commit: Examining .
Checking in newfile.txt;
/cvsrepo/imghcm/newfile.txt,v <-- newfile.txt
new revision: 1.2; previous revision: 1.1
done
but the archive on the server remains unchanged. This leaves the client
believing that it has version 1.2 but the server only has knowledge of
version 1.1, which causes update to reinstate the older version,
over-writing the new one without warning.
Has anyone experienced anything similar or have any suggestions on what
could cause this behaviour?
Thanks,
Mark
Client: WinXP SP1, CVSNT 2.0.41, no A/V, running cvs from the command line,
connecting via sspi.
Server: Windows Server 2003, CVSNT 2.0.41, no A/V.
Output of cvs -t -t -t commit -m "test" when committing second version of
the file:
C:\dev\fromIMGKLCVS\temp\imghcm>cvs -t -t -t commit -m"test"
-> Tracelevel set to 3. PID is 308
-> Session ID is 13440a24cfa0000
-> main loop with CVSROOT=:sspi:imgklcvs:/cvsrepo
-> Requesting server cvsignore
-> Requesting server cvswrappers
-> Requesting server cvsrc (read-cvsrc2)
-> Parsing global cvsrc started
-> log -N
-> diff -u
-> update -d -P
-> checkout -P
-> Parsing global cvsrc finished
-> Name_Repository((null),)
-> real_dir_name /cvsrepo/imghcm
-> Repository = /cvsrepo/imghcm
-> Mapped repository = /cvsrepo/imghcm
cvs commit: Examining .
-> Name_Repository((null),)
-> real_dir_name /cvsrepo/imghcm
-> Repository = /cvsrepo/imghcm
-> Mapped repository = /cvsrepo/imghcm
-> set_repository_version((null),(null))
-> No translation file in this repository. Disabling.
cvs commit: Examining cvsnt
-> Name_Repository((null),cvsnt)
-> real_dir_name /cvsrepo/imghcm/cvsnt
-> Repository = /cvsrepo/imghcm/cvsnt
-> Mapped repository = /cvsrepo/imghcm/cvsnt
-> set_repository_version((null),(null))
cvs commit: Examining perl
-> Name_Repository((null),perl)
-> real_dir_name /cvsrepo/imghcm/perl
-> Repository = /cvsrepo/imghcm/perl
-> Mapped repository = /cvsrepo/imghcm/perl
-> set_repository_version((null),(null))
-> set_repository_version((null),(null))
-> Name_Repository((null),)
-> real_dir_name /cvsrepo/imghcm
-> Repository = /cvsrepo/imghcm
-> Mapped repository = /cvsrepo/imghcm
-> set_repository_version((null),(null))
-> Sending file 'newfile2.txt' to server
-> set_repository_version((null),(null))
S -> set_repository_version((null),(null))
S -> No translation file in this repository. Disabling.
S -> Name_Repository((null),)
S -> Loading modules2 from D:/cvsrepo/CVSROOT/modules2
S -> real_dir_name D:/cvsrepo/imghcm
S -> Repository = D:/cvsrepo/imghcm
S -> Mapped repository = D:/cvsrepo/imghcm
S -> lock_crashrecover D:/cvsrepo/imghcm
S -> set_repository_version((null),(null))
S -> fileattr_startdir(D:/cvsrepo/imghcm)
S -> do_atomic_start D:/cvsrepo/imghcm
S -> recursive_mirror(D:/cvsrepo/imghcm,D:/cvsrepo/imghcm##copy##)
S -> recursive_mirror(D:/cvsrepo/imghcm/CVS,D:/cvsrepo/imghcm##copy##/CVS)
S ->
recursive_mirror(D:/cvsrepo/imghcm/cvsnt,D:/cvsrepo/imghcm##copy##/cvsnt)
S -> recursive_mirror(D:/cvsrepo/imghcm/perl,D:/cvsrepo/imghcm##copy##/perl)
S -> set_repository_version((null),(null))
S -> verify_access .,,(null)
S -> Name_Repository(.,)
S -> Checking admin file D:/cvsrepo/CVSROOT/admin for user mrv
S -> find_perms(D:/cvsrepo/imghcm,,admin,(null),0)
S -> find_perms(D:/cvsrepo/imghcm,rwc,mrv,(null),0)
S -> Name_Repository((null),)
S -> real_dir_name D:/cvsrepo/imghcm
S -> real dir name is D:/cvsrepo/imghcm##copy##
S -> Repository = D:/cvsrepo/imghcm
S -> Mapped repository = D:/cvsrepo/imghcm##copy##
S -> lock_crashrecover D:/cvsrepo/imghcm##copy##
S -> set_repository_version((null),(null))
S -> verify_access (null),D:/cvsrepo/imghcm##copy##,(null)
S -> find_perms(D:/cvsrepo/imghcm##copy##,,admin,(null),0)
S -> find_perms(D:/cvsrepo/imghcm##copy##,rwc,mrv,(null),0)
S -> fileattr_startdir(D:/cvsrepo/imghcm##copy##)
S -> set_repository_version((null),(null))
S -> map_file(D:/cvsrepo/imghcm,newfile2.txt)
S -> verify_access ,D:/cvsrepo/imghcm##copy##,(null)
S -> find_perms(D:/cvsrepo/imghcm##copy##,,admin,(null),0)
S -> find_perms(D:/cvsrepo/imghcm##copy##,rwc,mrv,(null),0)
S -> checkout (/cvsrepo/imghcm/newfile2.txt,v, 1.1, , (function))
S -> find_perms(D:/cvsrepo/imghcm##copy##,,admin,(null),0)
S -> find_perms(D:/cvsrepo/imghcm##copy##,rwc,mrv,(null),0)
S -> ParseInfo(D:/cvsrepo/CVSROOT/commitinfo, imghcm, ALL)
S -> set_repository_version((null),(null))
S -> verify_access .,,(null)
S -> Name_Repository(.,)
S -> find_perms(D:/cvsrepo/imghcm,,admin,(null),0)
S -> find_perms(D:/cvsrepo/imghcm,rwc,mrv,(null),0)
S -> Name_Repository((null),)
S -> real_dir_name D:/cvsrepo/imghcm
S -> real dir name is D:/cvsrepo/imghcm##copy##
S -> Repository = D:/cvsrepo/imghcm
S -> Mapped repository = D:/cvsrepo/imghcm##copy##
S -> lock_crashrecover D:/cvsrepo/imghcm##copy##
S -> set_repository_version((null),(null))
S -> verify_access (null),D:/cvsrepo/imghcm##copy##,(null)
S -> find_perms(D:/cvsrepo/imghcm##copy##,,admin,(null),0)
S -> find_perms(D:/cvsrepo/imghcm##copy##,rwc,mrv,(null),0)
S -> fileattr_startdir(D:/cvsrepo/imghcm##copy##)
S -> set_repository_version((null),(null))
S -> map_file(D:/cvsrepo/imghcm,newfile2.txt)
S -> verify_access ,D:/cvsrepo/imghcm##copy##,(null)
S -> find_perms(D:/cvsrepo/imghcm##copy##,,admin,(null),0)
S -> find_perms(D:/cvsrepo/imghcm##copy##,rwc,mrv,(null),0)
S -> find_perms(D:/cvsrepo/imghcm##copy##,,admin,(null),0)
S -> find_perms(D:/cvsrepo/imghcm##copy##,rwc,mrv,(null),0)
S -> ParseInfo(D:/cvsrepo/CVSROOT/verifymsg, imghcm, not ALL)
S -> unlink(D:\cvstemp\cvs2B.tmp)
Checking in newfile2.txt;
/cvsrepo/imghcm/newfile2.txt,v <-- newfile2.txt
S -> checkout (/cvsrepo/imghcm/newfile2.txt,v, 1.1, -ko,
D:\cvstemp\cvs2C.tmp)
S -> checkout ->
S -> Insert delta at head (1.1,1.2)
S -> get_file(newfile2.txt,newfile2.txt,r,0000)
S -> get_file -> blah waffle
help it's not working
S -> diff_exec(newfile2.txt,D:\cvstemp\cvs2C.tmp,(null),(null),-a
-n,D:\cvstemp\
cvs2D.tmp)
S -> get_file(D:\cvstemp\cvs2D.tmp,D:\cvstemp\cvs2D.tmp,r,0000)
S -> get_file -> d1 2
a2 1
blah waffle
new revision: 1.2; previous revision: 1.1
S -> RCS_rewrite(D:/cvsrepo/imghcm/newfile2.txt,v,blah waffle
help it's not working,1.1,0)
S -> RCS_copydeltas(1.1,1.2,1,0)
S ->
rename(D:/cvsrepo/imghcm/,newfile2.txt,,D:/cvsrepo/imghcm/newfile2.txt,v)
S -> unlink(D:\cvstemp\cvs2C.tmp)
S -> unlink(D:\cvstemp\cvs2D.tmp)
done
S -> checkout (/cvsrepo/imghcm/newfile2.txt,v, , , (function))
S -> server_register(newfile2.txt, 1.2, Wed May 12 16:12:29 2004, , , , , ,
4705
174)
S -> Register(newfile2.txt, 1.2, Wed May 12 16:12:29 2004, , , , 4705174)
S -> fopen(D:/cvsrepo/CVSROOT/history,a)
S -> ParseInfo(D:/cvsrepo/CVSROOT/historyinfo, imghcm, ALL)
-> call_in_directory './'
-> set_repository_version((null),(null))
-> unlink(CVS/Base/newfile2.txt)
-> Register(newfile2.txt, 1.2, Wed May 12 16:12:29 2004, , , , 3838511)
S -> editor_set(newfile2.txt,mrv,(null))
S -> ParseInfo(D:/cvsrepo/CVSROOT/loginfo, imghcm, ALL)
S -> copy(CVS/Entries,CVS/Entries.Old)
S -> unlink(CVS/Entries.Old)
S -> rename(CVS/Entries.Backup,CVS/Entries)
S -> copy(CVS/Entries.Extra,CVS/Entries.Extra.Old)
S -> unlink(CVS/Entries.Extra.Old)
S -> rename(CVS/Entries.Extra.Backup,CVS/Entries.Extra)
S -> unlink(CVS/Entries.Log)
S -> unlink(CVS/Entries.Extra.Log)
S -> do_atomic_end D:/cvsrepo/imghcm
S -> unlink_file_dir(D:/cvsrepo/imghcm##backup##)
S -> ParseInfo(D:/cvsrepo/CVSROOT/postcommit, imghcm, ALL)
S -> Name_Repository((null),newfile2.txt)
S -> do_module(imghcm, Checking in, , )
-> copy(CVS/Entries,CVS/Entries.Old)
-> unlink(CVS/Entries.Old)
-> rename(CVS/Entries.Backup,CVS/Entries)
-> copy(CVS/Entries.Extra,CVS/Entries.Extra.Old)
-> unlink(CVS/Entries.Extra.Old)
-> rename(CVS/Entries.Extra.Backup,CVS/Entries.Extra)
-> unlink(CVS/Entries.Log)
-> unlink(CVS/Entries.Extra.Log)
******************
This e-mail has been sent from Imagination Technologies Limited.
PowerVR, Metagence, Ensigma and PURE Digital are divisions
of Imagination Technologies Limited.
The information contained in this e-mail, including any attachment,
is confidential and may be legally privileged. It is intended solely
for the addressee(s) and access to this e-mail by anyone else is
unauthorised. If you are not the intended recipient, any disclosure,
copying or distribution or use of the information contained in this
e-mail, is prohibited and may be unlawful. If you have received this
e-mail in error, please notify the sender by return e-mail and then
delete it from your system.
Internet communications cannot be guaranteed to be secure,
error or virus-free. The sender does not accept liability for any errors
or omissions which arise as a result.
Any views expressed in this message are those of the author, except
where the author specifies and, with authority, states them to be the
views of Imagination Technologies Ltd.
More information about the cvsnt
mailing list