Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changes between Version 4 and Version 5 of code/tools/SVN


Ignore:
Timestamp:
Feb 18, 2008, 12:06:43 AM (16 years ago)
Author:
nicolasc
Comment:

mv, cp

Legend:

Unmodified
Added
Removed
Modified
  • code/tools/SVN

    v4 v5  
    88svn add myFile.cc myFile.h
    99svn rm trash-folder
     10svn mv myFile.cc myFile.h myFolder
     11svn cp https://svn.orxonox.net/orxonox/trunk https://svn.orxonox.net/orxonox/branches/test
    1012svn resolved somefile.cc
    11 svn cp https://svn.orxonox.net/orxonox/trunk https://svn.orxonox.net/orxonox/branches/test
    1213svn diff
    1314svn revert
     
    7273}}}
    7374
     75=== move (mv) ===
     76sometime called rename - as a rename is the same as a move. The command simplifies the rearranging of files in the svn tree. the syntax is ''svn mv <source files> <target-folder>''
     77
     78this will move the files myFile.cc and myFile.h to myFolder
     79{{{
     80svn mv myFile.cc myFile.h myFolder
     81}}}
     82
     83this will rename the file myFiel.cc to myFile.cc - to correct a typo. please note the mv and rename are the same command
     84{{{
     85svn rename myFiel.cc myfile.cc
     86}}}
     87
     88=== copy (cp) ===
     89a command which is rarely used on the local tree - why would someone need a file twice in the same tree? - but it is rather useful to create new branches. though it is normally done by the supervisors, it can be done by the students.
     90
     91this will create a new branch called test from the current version of the trunk
     92{{{
     93svn cp https://svn.orxonox.net/orxonox/trunk https://svn.orxonox.net/orxonox/branches/test
     94}}}
     95
    7496=== resolved ===
    7597if a conflict arises - this normally happens if someone change a file on the server (committed it) while you were doing changes in the same place. This command '''does not solve''' the conflict, but it removes the other unnecessary files.