[cvsnt] dry run error on update command

Zlatko Arifhodzic zlatko at free.fr
Thu May 18 17:31:29 BST 2006


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


Hello,

We've switched from cvs to cvsnt recently and eveything seems ok excepted that we cannot perform any preview before merging.

We used to do this by using the dry run -n option with command update.

However, we get a curious message telling that the file does not exist on the server !

For info we're using cvsnt 2.5.03 on debian linux. The clients (linux and win) use the command line tool via the pserver protocol.

Here is an illustration of the problem :

      testuser at squid:~/dev/workspaces/tests/branching/head$ cvsnt status sandbox/testmerge/myfile.txt
      ===================================================================
      File: myfile.txt        Status: Up-to-date
      
         Working revision:    1.2
         Repository revision: 1.2     /code/sandbox/testmerge/myfile.txt,v
         Expansion option:    kv
         Commit Identifier:   4ef1446c868f0cff
         Sticky Tag:          (none)
         ...

      testuser at squid:~/dev/workspaces/tests/branching/branch$ cvsnt status sandbox/testmerge/myfile.txt
      ===================================================================
      File: myfile.txt        Status: Up-to-date
      
         Working revision:    1.1.2.1
         Repository revision: 1.1.2.1 /code/sandbox/testmerge/myfile.txt,v
         Expansion option:    kv
         Commit Identifier:   4f29446c86fcf1f2
         Sticky Tag:          TEST_MERGE_BRANCH (branch: 1.1.2)
         ...

Now when we try a merge preview : 

      testuser at squid:~/dev/workspaces/tests/branching/head$ cvsnt -n update -j TEST_MERGE_BRANCH sandbox/testmerge/myfile.txt
      RCS file: /code/sandbox/testmerge/myfile.txt,v
      retrieving revision 1.1
      retrieving revision 1.1.2.1
      Merging differences between 1.1 and 1.1.2.1 into myfile.txt
      cvsnt server: myfile.txt: No such file or directory

We got this strange  "No such file or directory" error !

Of course, want we want in finality is to perform a recursive merge preview, 
but the operation fails on the first file with the very same error. 

If we enable the server logs we got the following result  : 
      ...
      16:59:14: S -> ACL lookup on directory /var/cvs/code/sandbox
      16:59:14: S -> verify_acl(read,HEAD,(null))
      16:59:14: S -> matched ACL user=, branch=_default_, merge=
      ...
      16:59:14: S -> matched ACL user=, branch=_default_, merge=
      16:59:14: S -> calculated ACL priority is 0
	...
      16:59:14: S -> RCS_checkout (/code/sandbox/testmerge/myfile.txt,v, 1.2, kV, myfile.txt)
      16:59:14: S -> copy(myfile.txt,.#myfile.txt.1.2)
      16:59:14: S -> rcs_merge(/var/cvs/code/sandbox/testmerge/myfile.txt,v,/var/cvs/code/sandbox/testmerge/myfile.txt,v,myfile.txt,kV,1.1,1.1.2.1)
       ....      
      16:59:14: S -> got rcs_mode = 0644 from rcs-permissions-tag
      16:59:14: S -> RCS_checkout (/code/sandbox/testmerge/myfile.txt,v, 1.1.2.1, kV, /tmp/cvsnmQIjc)
      ....
      16:59:14: S -> Calling diff3 with myfile.txt, /tmp/cvsOuyKcg, /tmp/cvsnmQIjc
      16:59:14: S -> diff3 returned 2
      16:59:14: S -> unlink_file_dir(/tmp/cvs-serv20708)

>From what I understand, the server got both of the files, performed a diff, so I realy don't understand why we get a " No such file or directory" error.

Thanks for any information or pointers !

PS : I'm sorry if this subject was already answered, however I was unable to find any info by searching the internet and the mail list archives. 




More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook