Tags:
create new tag
view all tags

SVN

documents

import your code to SVN

check out

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

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.

Edit | Attach | Watch | Print version | History: r2 < r1 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r2 - 2020-04-14 - ZhuChengguang
 
This site is powered by the TWiki collaboration platform Powered by PerlCopyright © 2008-2022 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback