SVN

documents

• http://svn.web.cern.ch/svn/
• https://svn.web.cern.ch/svn/howto.php
• http://svn.web.cern.ch/svn/docs/Nagel_book.pdf
• http://svn.web.cern.ch/svn/docs/svn-book.pdf

import your code to SVN

• first time to check in one package, e.g. import package MyD3PD _Ana/ to name topD3PD in responsitory
  • svn mkdir http://svn.lhaaso.ihep.ac.cn/People/zhucg/trunk/MyD3PD_Ana/
  • svn import --m "Initial import" MyD3PD _Ana/ http://svn.lhaaso.ihep.ac.cn/People/zhucg/trunk/MyD3PD_Ana/
    • all the files and subdirectories in MyD3PD _Ana will be copied in to trunk as a developing code

check out

• svn co http://svn.lhaaso.ihep.ac.cn/People/zhucg/trunk/MyD3PD_Ana/ test
  • will checkout all file and directories in "MyD3PD_Ana" directory to a dir "test"

commit

• svn commit --message " "
  • this will only write back the changes of existing files, not add new files in working copy to reponsitory.
• if want to add new files, use: "svn add file" and then "svn commit -m"commit" "

make tags

• when code in truck has been developed for some time and is good to use, you can make a copy in the tags directory
• svn copy --message " say something for this version" http://svn.lhaaso.ihep.ac.cn/People/zhucg/trunk/MyD3PD_Ana/ http://svn.lhaaso.ihep.ac.cn/People/zhucg/tags/MyD3PD_Ana/version_1_0
• this is samilar that you are providing a good product to people, so you give a clear tag name.

problem when using SVN

svn: Checksum mismatch for file ...

solution:

• backup file
• svn delete --force file
• cp file back
• svn add file

error in commit:

• error message 1

svn: Commit failed (details follow):
svn: Directory '/tmp/czhu/forR16Data_4/externalPac/RootCore/python/.svn' containing working copy admin area is missing

• solution
  • mv it out and svn delete the directory
  • mv it back and svn add

• error message 2

svn: Commit failed (details follow):
svn: No repository found in 'svn+ssh://svn.cern.ch/reps'

• solution no very good solution now svn diff to find which files need to be committed svn ci XXXXfile -m"" to check in the files one by one. remove this working copy and re-checkout all the copy.

3

svn: Directory 'externalPac/RootCore/python/.svn' containing working copy admin area is missing

• solution rm externalPac/RootCore/python svn del --force externalPac/RootCore/python

but this will induce the problem 2 above.

4

Transmitting file data .svn: Commit failed (details follow):
svn: Commit blocked by pre-commit hook (exit code 1) with output:
Some parts of your commit look suspiciously like merge
conflict markers.  Please double-check your diff and try
committing again.

• solution some contents of the files are rejected by svn. you can commit files one by one to see which file does match the problem

5

svn Commit blocked by pre-commit hook (exit code 1) with output

Clash: '/xAODanalysis/trunk/MyPhysics/MyPhysics/physicsD3PD.h' '/xAODanalysis/trunk/MyPhysics/MyPhysics/PhysicsD3PD.h':

• solution, there are two files in the same directory, which are only different in Capton letters.

6

svn: Directory '/DMcode/trunk/configure/backupCode' is out of date

move your useful files to other place, run "svn up configure/backupCode", move your useful files back and do svn add or ci.

7

svn ci -m"update" svn: Commit failed (details follow): svn: Aborting commit: '/afs/cern.ch/user/c/czhu/xAODanalysis/MyAnalysis' remains in conflict

svn resolve MyAnalysis --accept working //according to which version you want to keep.