Difference: ZhuCVS (1 vs. 26)

Revision 262015-01-05 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 174 to 174
 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. \ No newline at end of file

Added:
>
>
*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.

 \ No newline at end of file

Revision 252015-01-05 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 169 to 169
 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.
\ No newline at end of file
Added:
>
>
*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.

 \ No newline at end of file

Revision 242014-12-30 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 163 to 163
 
  • 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
\ No newline at end of file
Added:
>
>
*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.
 \ No newline at end of file

Revision 232013-06-05 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"

CVS

Deleted:
<
<

set access right for other person

  • change file /afs/cern.ch/project/svn/reps/topana/conf/authz
 

set access

Line: 42 to 40
 
    • cvs commit=

SVN

Added:
>
>

set access right for other person

  • change file /afs/cern.ch/project/svn/reps/topana/conf/authz
 

documents

Changed:
<
<

repons

>
>

use in CERN or outside of CERN

  • the example in the following is for using svn in CERN with lxplus.cern.ch
  • if use it outside of CERN change "svn+ssh://svn.cern.ch" to "svn+ssh://Accountname@svn.cern.ch" in all the example below.
    • for example, Duyanyan has account on lxplus.cern.ch "ydu" the she use svn+ssh://ydu@svn.cern.ch to access SVN

the repository

  • the main reponsitory is svn+ssh://svn.cern.ch/reps/topana, you can view it with web https://svnweb.cern.ch/cern/wsvn/topana/
  • directory in the repository are opened for persons, they have the write and reading right.
    • svn+ssh://svn.cern.ch/reps/topana/ydu for duyanyan
    • svn+ssh://svn.cern.ch/reps/topana/rshao for shaoruobin
  • to do excise, for example, ydu
    • svn mkdir svn+ssh://ydu@svn.cern.ch/reps/topana/ydu/test to make a subdirectory and do any excise in it
    • to make a directory structure for your package saving is a good cumtom.
 

import

Changed:
<
<
  • first time to check in one package, e.g. import package MyD3PD_Ana/ to name topD3PD
>
>
  • first time to check in one package, e.g. import package MyD3PD_Ana/ to name topD3PD in responsitory
 
    • svn mkdir svn+ssh://svn.cern.ch/reps/topana/topD3PD
    • svn mkdir svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk
    • svn import --message "Initial import" MyD3PD_Ana/ svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk
Changed:
<
<
      • MyD3PD_Ana will be named in svn as topD3PD, the content of MyD3PD_Ana will be saved in trunk
>
>
      • all the files and subdirectories in MyD3PD_Ana will be copied in to trunk as a developing code
 

check out

  • svn co svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk test
Changed:
<
<
    • will checkout "topD3PD/trunk" directory to a dir "test"
>
>
    • will checkout all file and directories in "topD3PD/trunk" 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.
Changed:
<
<
  • if want to add new files, use: svn add file
    • file will be registered and will be added to reponstory when commit is ran.
    • similar with svn delete
>
>
  • if want to add new files, use: "svn add file" and then "svn commit"

 

make tags

Changed:
<
<
  • svn copy --message " cut flow OK for data r_16.0.3.3.3" svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk svn+ssh://svn.cern.ch/reps/topana/topD3PD/tags/version_1_0
>
>
  • 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" svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk svn+ssh://svn.cern.ch/reps/topana/topD3PD/tags/version_1_0
  • this is samilar that you are providing a good product to people, so you give a clear tag name.
 

merge

Revision 222012-07-18 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 105 to 105
 
svn: Commit failed (details follow):
svn: Directory '/tmp/czhu/forR16Data_4/externalPac/RootCore/python/.svn' containing working copy admin area is missing
Changed:
<
<
<\verbatim>
>
>
 
  • solution
    • mv it out and svn delete the directory
Line: 116 to 116
 
svn: Commit failed (details follow):
svn: No repository found in 'svn+ssh://svn.cern.ch/reps'
Changed:
<
<
<\verbatim>
>
>
 
  • solution no very good solution now
Line: 128 to 128
  *3
svn: Directory 'externalPac/RootCore/python/.svn' containing working copy admin area is missing
Changed:
<
<
<\verbatim>
>
>
 
  • solution rm externalPac/RootCore/python
Line: 143 to 143
 Some parts of your commit look suspiciously like merge conflict markers. Please double-check your diff and try committing again.
Changed:
<
<
<\verbatim>
>
>
 
  • solution some contents of the files are rejected by svn.

Revision 212012-04-28 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 135 to 135
  svn del --force externalPac/RootCore/python

but this will induce the problem 2 above. \ No newline at end of file

Added:
>
>
  • 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.
<\verbatim>

   * 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
 \ No newline at end of file

Revision 202012-03-14 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 119 to 119
 <\verbatim>

  • solution
Changed:
<
<
no good solution now, check out a new copy and copy the changed file to the new working place and commit
>
>
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

Revision 192012-03-13 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 119 to 119
 <\verbatim>

  • solution
\ No newline at end of file
Added:
>
>
no good solution now, check out a new copy and copy the changed file to the new working place and commit

*3

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

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

   but this will induce the problem 2 above.

Revision 182012-03-03 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 111 to 111
 
    • mv it out and svn delete the directory
    • mv it back and svn add

\ No newline at end of file

Added:
>
>
  • 2
svn: Commit failed (details follow):
svn: No repository found in 'svn+ssh://svn.cern.ch/reps'
<\verbatim>

   * solution
 \ No newline at end of file

Revision 172012-02-17 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 72 to 72
 

make tags

  • svn copy --message " cut flow OK for data r_16.0.3.3.3" svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk svn+ssh://svn.cern.ch/reps/topana/topD3PD/tags/version_1_0
Deleted:
<
<

problem

svn: Checksum mismatch for file ...

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

merge

  • This is an example of how to cooperate in code developing with "svn merge"
Line: 97 to 90
 
    • svn ci -m"dev"
    • make new tag
  • be careful, for each new downloaded tagged package, you should make a new branch, the old branch will be discarded.
Added:
>
>

problem

svn: Checksum mismatch for file ...

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

error in commit:

  • error message
svn: Commit failed (details follow):
svn: Directory '/tmp/czhu/forR16Data_4/externalPac/RootCore/python/.svn' containing working copy admin area is missing
<\verbatim>

   * solution
      * mv it out and svn delete the directory 
      * mv it back and svn add
      
 \ No newline at end of file

Revision 162012-02-12 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 79 to 79
 
  • svn delete --force file
  • cp file back
  • svn add file
\ No newline at end of file
Added:
>
>

merge

  • This is an example of how to cooperate in code developing with "svn merge"

  • Downloading JetSelectionD3PD-00-00-06 to your working copy JetSelectionD3PD
  • if user wants to modify this package:
    • cd JetSelectionD3PD
    • svn import -m"start of JetSelectionD3PD-00-00-06 branch JetSelectionD3PD-01" svn+ssh://svn.cern.ch/reps/atlasmon/JetSelectionD3PD/branches/JetSelectionD3PD-01 //e.g it is rev 100
    • svn switch svn+ssh://svn.cern.ch/reps/atlasmon/JetSelectionD3PD/branches/JetSelectionD3PD-01
    • svn ci -m"...."
  • I will merge your modification into my JetSelectionD3PD/trunk
    • cd JetSelectionD3PD // this is my developing copy which may also changed a lot
    • svn merge svn+ssh://svn.cern.ch/reps/atlasmon/JetSelectionD3PD/branches/JetSelectionD3PD-01@100 svn+ssh://svn.cern.ch/reps/atlasmon/JetSelectionD3PD/branches/JetSelectionD3PD-01
    • If no conflicts ( both didn't modify the same line, it's OK, otherwise you can choose option (p), and edit after merging.
    • svn ci -m"dev"
    • make new tag
  • be careful, for each new downloaded tagged package, you should make a new branch, the old branch will be discarded.

Revision 152012-01-16 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 50 to 50
 

repons

  • svn co svn+ssh://svn.cern.ch/reps/topana
Changed:
<
<
>
>
 

import

Added:
>
>
  • first time to check in one package, e.g. import package MyD3PD_Ana/ to name topD3PD
    • svn mkdir svn+ssh://svn.cern.ch/reps/topana/topD3PD
    • svn mkdir svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk
 
  • svn import --message "Initial import" MyD3PD_Ana/ svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk
Changed:
<
<
    • MyD3PD_Ana will not appear in the reponsitory,
    • svn+ssh://svn.cern.ch/reps/topana is the root name of my svn reponsitory.
    • The directory structure in the MyD3PD_Ana will be imported:
      • topD3PD/trunk
      • topD3PD/branches
      • topD3PD/tags
>
>
      • MyD3PD_Ana will be named in svn as topD3PD, the content of MyD3PD_Ana will be saved in trunk
 

check out

  • svn co svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk test
Changed:
<
<
    • will checkout "trunk" directory to a dir "test"
>
>
    • will checkout "topD3PD/trunk" directory to a dir "test"
 

commit

  • svn commit --message " "

Revision 142012-01-10 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"

CVS

Added:
>
>

set access right for other person

  • change file /afs/cern.ch/project/svn/reps/topana/conf/authz
 

set access

Line: 50 to 53
 

import

Changed:
<
<
  • svn import --message "Initial import" MyD3PD_Ana/ svn+ssh://svn.cern.ch/reps/topana
>
>
  • svn import --message "Initial import" MyD3PD_Ana/ svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk
 
    • MyD3PD_Ana will not appear in the reponsitory,
    • svn+ssh://svn.cern.ch/reps/topana is the root name of my svn reponsitory.
    • The directory structure in the MyD3PD_Ana will be imported:

Revision 132011-07-29 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 71 to 71
 

make tags

  • svn copy --message " cut flow OK for data r_16.0.3.3.3" svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk svn+ssh://svn.cern.ch/reps/topana/topD3PD/tags/version_1_0
\ No newline at end of file
Added:
>
>

problem

svn: Checksum mismatch for file ...

solution:
  • backup file
  • svn delete --force file
  • cp file back
  • svn add file
 \ No newline at end of file

Revision 122011-03-16 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 51 to 51
 

import

  • svn import --message "Initial import" MyD3PD_Ana/ svn+ssh://svn.cern.ch/reps/topana
Changed:
<
<
    • MyD3PD_An will not appear in the reponsitory,
    • The directory structure topD3PD/trunk topD3PD/branches topD3PD/tags will be imported
>
>
    • MyD3PD_Ana will not appear in the reponsitory,
    • svn+ssh://svn.cern.ch/reps/topana is the root name of my svn reponsitory.
    • The directory structure in the MyD3PD_Ana will be imported:
      • topD3PD/trunk
      • topD3PD/branches
      • topD3PD/tags
 

check out

  • svn co svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk test

Revision 112011-02-16 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 64 to 64
 
  • if want to add new files, use: svn add file
    • file will be registered and will be added to reponstory when commit is ran.
    • similar with svn delete
Added:
>
>

make tags

  • svn copy --message " cut flow OK for data r_16.0.3.3.3" svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk svn+ssh://svn.cern.ch/reps/topana/topD3PD/tags/version_1_0
 \ No newline at end of file

Revision 102011-02-11 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 57 to 57
 

check out

  • svn co svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk test
    • will checkout "trunk" directory to a dir "test"
Added:
>
>

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
    • file will be registered and will be added to reponstory when commit is ran.
    • similar with svn delete

Revision 92011-02-11 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 50 to 50
 

import

Changed:
<
<
  • svn import --message "Initial import" DIR svn+ssh://svn.cern.ch/reps/topana
    • DIR will not appear in the reponsitory, only the sub-directory will be in
>
>
  • svn import --message "Initial import" MyD3PD_Ana/ svn+ssh://svn.cern.ch/reps/topana
    • MyD3PD_An will not appear in the reponsitory,
    • The directory structure topD3PD/trunk topD3PD/branches topD3PD/tags will be imported

check out

  • svn co svn+ssh://svn.cern.ch/reps/topana/topD3PD/trunk test
    • will checkout "trunk" directory to a dir "test"

Revision 82011-02-10 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Line: 39 to 39
 
    • cvs commit=

SVN

\ No newline at end of file
Added:
>
>

documents

repons

import

  • svn import --message "Initial import" DIR svn+ssh://svn.cern.ch/reps/topana
    • DIR will not appear in the reponsitory, only the sub-directory will be in

Revision 72011-02-10 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Changed:
<
<
-- ChengguangZhu - 02 Apr 2008
>
>
 
Changed:
<
<

set access

>
>

CVS

set access

 
  • set access to CERN cvs by SSH
    • export CVSROOT = :ext:cvstopan@isscvs.cern.ch:/local/reps/top_analysis
    • export CVS_RSH=ssh
  • my cvs account is: cvstopan
  • login cvstopan on lxplus.cern.ch and organize the reponsitory in /afs/cern.ch/project/cvs/reps/top_analysis

Changed:
<
<

creat project mannual

>
>

creat project mannual

 
  • see created projects at cvs project AnalysisExamples
  • create projects: (stand in the directory of AnalysisExamples)
    • cvs import -m "release 10.0.1 start point" AnalysisExamples athena10_0_1 AnalysisExamples10_0_1-0_0
Line: 22 to 23
 
    • cvs import -m "project container" myAnalysisCode R0 R00
  • create projects with some files ignored
    • cvs import -I*ps -I*.gif  -m "1206vs1303" myAnalysisCode/1206.vs.1303 R0 R0_0
Changed:
<
<

to Check out

>
>

to Check out

 
  • file
  • module
Line: 36 to 37
 
    • cvs add file
    • cvs remove file
    • cvs commit=
Added:
>
>

SVN

 \ No newline at end of file

Revision 62008-09-19 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
-- ChengguangZhu - 02 Apr 2008
Line: 7 to 7
 
    • export CVSROOT = :ext:cvstopan@isscvs.cern.ch:/local/reps/top_analysis
    • export CVS_RSH=ssh
  • my cvs account is: cvstopan
Added:
>
>
  • login cvstopan on lxplus.cern.ch and organize the reponsitory in /afs/cern.ch/project/cvs/reps/top_analysis

 

creat project mannual

Revision 52008-04-16 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
-- ChengguangZhu - 02 Apr 2008

set access

Changed:
<
<
    • export CVSROOT:ext:isscvs.cern.ch:/local/reps/top_analysis=
>
>
    • export CVSROOT = :ext:cvstopan@isscvs.cern.ch:/local/reps/top_analysis
 
    • export CVS_RSH=ssh
  • my cvs account is: cvstopan

creat project mannual

Revision 42008-04-06 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
-- ChengguangZhu - 02 Apr 2008
Line: 23 to 23
 

to Check out

Changed:
<
<
  • directory
>
>
  • module
 
Added:
>
>
*
    • cvs co -d mynew -r AnalysisExamples11_0_41-0_0 AnalysisExamples
    • -q quiet on output
    • -d creat and use this directory to contain this checkout release, here you will see a package named as "mynew" ,not "!AnalysisExamples", but the content is same as last command
    • Similarly, cvs co -d mynew1 -r R0_0 myAnalysisCode/Abias will not use long directory myAnalysisCode/Abias. but only put all content to "mynew1"
  • add remove file
    • cvs add file
    • cvs remove file
    • cvs commit=
 \ No newline at end of file

Revision 32008-04-03 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
-- ChengguangZhu - 02 Apr 2008
Line: 9 to 9
 
  • my cvs account is: cvstopan

creat project mannual

Changed:
<
<
  • create project AnalysisExamples10.0.1 with (stand on the directory just containing AnalysisExamples)
    • cvs import -m "release 10.0.1 start point" AnalysisExamples10.0.1 R10_0_1-0_0 R10_0_1-0
  • create project AnalysisExamples11.0.41
    • cvs import -m "release 11.0.41 start point" AnalysisExamples11.0.41 R11_0_41-0_0 R11_0_41-0
>
>
  • create projects: (stand in the directory of AnalysisExamples)
    • cvs import -m "release 10.0.1 start point" AnalysisExamples athena10_0_1 AnalysisExamples10_0_1-0_0
    • cvs import -m "release 11.0.41 start point" AnalysisExamples athena11_0_41 AnalysisExamples11_0_41-0_0
    • cvs import -m "release 12.0.6 start point" AnalysisExamples athena12_0_6 AnalysisExamples12_0_6-0_0
  • this can be used to create project under some project
    • cvs import -m "test" AnalysisExamples/test test test1
    • cvs checkout -r test1  AnalysisExamples/test
  • just make a container directory
    • cvs import -m "project container" myAnalysisCode R0 R00
  • create projects with some files ignored
    • cvs import -I*ps -I*.gif  -m "1206vs1303" myAnalysisCode/1206.vs.1303 R0 R0_0
 

to Check out

  • file
Changed:
<
<
    • cvs co -r R11_0_41-0 AnalysisExamples11.0.41/AnalysisExamples/AnalysisExamples-00-11-05/src/ttbar.cxx
>
>
 
  • directory
Changed:
<
<
>
>

Revision 22008-04-03 - ChengguangZhu

Line: 1 to 1
 
META TOPICPARENT name="ChengguangZhu"
Deleted:
<
<
 -- ChengguangZhu - 02 Apr 2008

set access

Line: 5 to 4
 

set access

Added:
>
>
    • export CVSROOT:ext:isscvs.cern.ch:/local/reps/top_analysis=
    • export CVS_RSH=ssh
 
  • my cvs account is: cvstopan

creat project mannual

Added:
>
>
 
  • create project AnalysisExamples10.0.1 with (stand on the directory just containing AnalysisExamples)
    • cvs import -m "release 10.0.1 start point" AnalysisExamples10.0.1 R10_0_1-0_0 R10_0_1-0
Changed:
<
<
>
>
  • create project AnalysisExamples11.0.41
    • cvs import -m "release 11.0.41 start point" AnalysisExamples11.0.41 R11_0_41-0_0 R11_0_41-0

to Check out

Revision 12008-04-03 - ChengguangZhu

Line: 1 to 1
Added:
>
>
META TOPICPARENT name="ChengguangZhu"

-- ChengguangZhu - 02 Apr 2008

set access

creat project mannual

  • create project AnalysisExamples10.0.1 with (stand on the directory just containing AnalysisExamples)
 
This site is powered by the TWiki collaboration platform Powered by PerlCopyright & 2008-2019 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback