Changes between Version 1 and Version 2 of SubversionCheatsheet


Ignore:
Timestamp:
28/04/06 12:06:52 (13 years ago)
Author:
domlowe
Comment:

Improved cheatsheet based on Charlotte's feedback (that it needed improving :-)

Legend:

Unmodified
Added
Removed
Modified
  • SubversionCheatsheet

    v1 v2  
    88For regular use, put it in your .profile (e.g .bash_profile) 
    99 
    10 Checkout a working copy: 
     10Checkout a working copy of the directory you need (in this case "TI01-discovery/trunk/"): 
    1111{{{  
    1212svn co $SROOT/TI01-discovery/trunk/  
    1313}}} 
    1414 
    15 You should only need to do this once, then in future you can use update: 
     15You should only need to do this once, then in future you can use update to check you have the latest version. 
    1616Update working copy (will replace your local copy with the latest from repository).: 
    1717{{{  
     
    1919}}} 
    2020  
    21 Make changes 
    22  * Do some work. 
    23  * You may also want to add or remove some files to/from your working copy. 
     21Make changes: 
     22 * Do some work (really... do some work, change things in your working copy). 
     23 * You may also want to add or remove some files or directories to/from your working copy. 
    2424{{{  
    25    svn add myfile/dir 
    26    svn delete myfile/dir 
    27    svn copy myfile/dir 
    28    svn move myfile/dir 
     25   svn add myfile     or   svn add dir 
     26   svn delete myfile  or   svn delete dir 
     27   svn copy myfile    or   svn copy dir 
     28   svn move myfile    or   svn move dir 
    2929   svn mkdir mydir 
    3030}}} 
    3131 
    32 Examine your changes 
     32Examine your changes: 
    3333 * Compare your local copy to the repository: 
    3434{{{ 
    35     svn status 
    36     svn diff 
    37     svn revert (throw away your work!) 
     35   svn diff   or   svn diff myfile   or   svn diff dir 
     36   svn status   or   svn status myfile   or   svn status dir     
    3837}}} 
    39  * Merge other’s changes (with Update)  
     38 * If you like you can throw away your work: 
     39{{{ 
     40   svn revert myfile (throw away your changes to the file!) 
     41   svn revert --recursive (throw away your changes to entire working directory and subdirectories!!) 
     42}}} 
     43 * Merge other people's changes with yours:  
    4044{{{ 
    4145svn update 
     
    5357to tell subversion the conflict is resolved. 
    5458 
     59 
    5560Commit your changes:  
    5661{{{