Changeset 1810

Show
Ignore:
Timestamp:
06/02/2006 10:39:46 AM (4 years ago)
Author:
wd15
Message:

CVS to SVN

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/documentation/ADMINISTRATA.txt

    r1794 r1810  
    11============= 
    2 CVS practices 
     2SVN practices 
    33============= 
    44 
    5 HEAD 
    6  
    7     this is of course a CVS internal tag designating the latest 
    8     revision of any file present in the repository.  It is also a 
    9     valid branch tag designating the trunk.  For our purposes HEAD can 
    10     be used as a tracking tag designating the very latest code checked 
    11     into the repository; |FiPy| is not guaranteed to pass its test or 
    12     to be in a consistent state when checked out under this tag. 
    13     Obviously this tracking tag is restricted to the trunk. 
    14  
    15 CURRENT 
    16  
    17     designates the most recent code on the trunk forming a coherent 
    18     state of |FiPy|, in general this will mean a release, but can also 
    19     mean a pre-release testing version.  For instance, the release 
    20     engineer might ask testers to test CURRENT before he makes a 
    21     release.  This tracking tag is restricted to the trunk. 
    22  
    23 STABLE 
    24  
    25     designates the most recent release in the repository that can be 
    26     considered stable for daily use by the common user.  This is a good tag 
    27     to track if you don't want to run into bugs introduced with ongoing 
    28     development but would like to take advantage of new features as soon as 
    29     possible. 
    30  
    31 version-x_y 
    32  
    33 branch-version-x_y 
    34  
    35 branch-refactoring_etc 
     5Refer to SVN.txt for the current tagging conventions. 
    366 
    377-------- 
    … …  
    399-------- 
    4010 
    41 Break off for radical refactoring. *Starting on main trunk*:: 
    42  
     11The following needs to be updated as we become more experienced with SVN 
     12 
     13Break off for radical refactoring. We will use the following method to 
     14preserve the tags/ and branches/ policy, though not strictly necessary 
     15with SVN, *Starting at base of trunk*:: 
     16     
    4317    $ export BRANCH=branch-refactoring_etc 
    44     $ cvs tag root-$BRANCH 
    45     $ cvs tag -b $BRANCH 
     18    $ export FIPYROOT=svn+ssh://username@matdl-osi.org/usr/local/svn-fipy-repos/ 
     19    $ svn copy $FIPYROOT/trunk $FIPYROOT/tags/root-$BRANCH -m "creating tag for $BRANCH" 
     20    $ svn copy $FIPYROOT/trunk $FIPYROOT/branches/$BRANCH -m "creating branch for $BRANCH" 
    4621    $ cd .. 
    47     $ cvs -d $FIPYROOT co -r $BRANCH -d $BRANCH fipy 
     22    $ svn co $FIPYROOT/branches/$BRANCH 
    4823    $ cd $BRANCH 
    4924 
    … …  
    5126 
    5227    $ emacs ... 
    53     $ cvs ci -m "refactoring" 
    54     $ cvs tag refactoring_stage_A 
    55  
     28    $ svn ci -m "refactoring_stage_A" 
     29    $ svn copy $FIPYROOT/$BRANCH $FIPYROOT/tags/refactoring_stage_A -m "refactoring_stage_A" 
    5630    $ emacs ... 
    57     $ cvs ci -m "more refactoring" 
    58     $ cvs tag refactoring_stage_B 
     31    $ svn ci -m "refactoring_stage_B" 
     32    $ svn copy $FIPYROOT/$BRANCH $FIPYROOT/tags/refactoring_stage_A -m "refactoring_stage_A" 
    5933 
    6034Merge developments from trunk:: 
     35 
     36    $ svn copy $FIPYROOT/trunk  
     37 
    6138 
    6239    $ cvs tag -r HEAD somePointOnTrunk 
    … …  
    243220 
    244221.. |FiPy| replace:: |htmlFiPy| |latexFiPy| 
     222 
     223================================ 
     224Converting CVS Repository to SVN 
     225================================ 
     226 
     227Jon can fill in the details