Subversion Quick Memo

• Subversion memo

Subversion memo

• Preface
  • I have moved to new environment, and in that environment, subversion is the revison control tool. I tried subversion and here is my memo. I made a comparison between subversion and cvs since I used to use cvs.
• Repository
  
  • I assume the subversion repository is located at /path/to/svnroot.
• Initialize
  

  Create the database (repository). You can select database type by --fs-type [fsfs|bdb] option, but I just use default.

       % svnadmin create /path/to/svnroot
       % (cvs -d /path/to/cvsroot init)
       

• Help
  

       % svn help
       % (cvs --help-options (global),  cvs -H [command] (command local))
       

• Convert CVS repository to Subversion
  Use cvs2svn. But I failed some files in Attiic. In my case, this file is clear of no longer necessary, so I just removed it. See cvs2svn.html. In case you want to convert only a project, also see faq.html in the svn documentation.

       % cp -rp /my/cvs/repository /cvs/copydir/
       #   make working dierctory for cvs2svn
       % mkdir /svn/workdir/
       #   move to the workiing directory
       % cd /svn/workdir/
       #   convert (--use-cvs is for safety)
       % cvs2svn --use-cvs --dump-only /cvs/copydir
       #   import converted data to svn repository
       % svnadmin load /path/to/svnroot < cvs2svn-dump
       

  After that you can delete the backup copy.
• Submit (called import) a directory structure. This is the first `add' command. Since first time, svn does not know anything about these files. After import, you need to check out. Once check outed, svn knows the structure, then add works.
  

       % svn import myproj file:///path/to/svnroot/myproj -m "Initial import"
       % (cvs import (position in the repository) vender-tag release-tag)
       (Ex.: % cvs import myproj hitoshi SNAP19980610)
       

  For branching, it is recommended to have a trunk directory under myproj. Like myproj/trunk.
• Get the newest version. Check out. (After import, you need at least once check out.)

       %  svn checkout (the position of top directory in the repository)
       Ex. svn checkout file:///path/to/svnroot/myproj/trunk
       % (cvs checkout (the position of top directory in the repository))
       

  After file: three '/'s (///) are necessary.
• Ignore files.
  
  • Global ignore
    
    I would like to ignore some files like *.o, SUSE10.1/, ... Global set up is ~/.subversion/config(Unix), %APPDATA%/Subversion/config(Windows, not checked by myself).
    There is a line, # global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store. You can write like that. In the case of cvs, ~/.cvsignore is used for global ignore.
  • Each directory ignore setting.
    
    If you want to set some ignore files at each directory, use svn propedit svn:ignore directory_name Then youe editor runs. Put the ignore patteren (similar to cvsignore). For example,

    	  *.png
    	  *.eps
    	  

    to ignore the *.png and *.eps files under the directory_name.
• Add files
  

       % svn add filename
       % (cvs add filename)
       and
       % svn commit
       % (cvs commit)
       

• Ooups, undo it!
  This is one better point of subversion. You can undo it. No revision data is changed.

       % svn revert filename
       % (svn revert --recursive directory)
       

• See the status
  

       % svn status
       % (cvs status,
       #   but cvs status is not so helpful, some people use cvs -n update)
       #   If you want to know what is ignored,
       % svn status --no-ignore
       

• Commit your change to repository.

       % svn commit
       % (cvs commit)
       

• Delete files.

       % svn delete file
       % (rm file; cvs remove file)
       

  If you haven't rm file-a, cvs complains it, but subversion does not.

• move files/directories.
  • This is one of the better part of subversion. Since cvs can not move files without loss of revision information. You always lose history of your file in cvs.

    	  % svn move src dst
    	  % (mv src dst; cvs remove src; cvs add dst)
    	  

• keyword substitution.
  • In default, svn do not change any contents of the file. If you want to use keyword substitution, like $Id:$, you need to tell svn to do that.

    	  svn propset svn:keywords "Id Date" your_file
    	  

  • Date, Revision, Author, HeadURL, and Id are available for keyword substitution.
• Move my repository
  • When you move the server A to B, and also change the repository directory, you can move the svn repository.
  • (See 5.4.5 Migrating repository data elsewhere)
  • Check the repository contents

    	  
    	  svnlook youngest /path/to/svnroot
    	  => revision number
    	  

  • Dump the repository contents.

    	  
    	  #
    	  # Dump the repository contents on the old machine
    	  #
    	  svnadmin dump /path/to/svnroot > svnrepository.dump
    	  #
    	  # create new repository on the new machine
    	  #
    	  svnadmin create /path/to/new/svnrepository
    	  svnadmin load /path/to/new/svnrepository < svnrepository.dump
    	  

• Network access (See the manual chapter 6)
  • If you want to use simple-authorized version (About the authorization, see /path/to/svnroot/conf/svnserve.conf)

    	  #
    	  # run the svnserve at the server machine.
    	  #   svnserve options
    	  #     -d daemon mode
    	  #     -r relative directory (Only show under this directory.)
    	  #
    	  svnserve -d -r /home/hitoshi/tmp/testrepos
    	  svn ls svn://localhost/trunk
    	  

  • ssh authorization

    	  svn ls svn+ssh://localhost/path/to/new/svnroot/trunk
    	  

    Note, svn+ssh runs svnserve locally, it does not matter svnserve runs already or not (maybe to be for secure reason). Therefore, you need the full path of the repository in this case.