Changes between Version 4 and Version 5 of CaffeinatedSubversion


Ignore:
Timestamp:
01/19/11 07:47:11 (10 years ago)
Author:
geofft
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CaffeinatedSubversion

    v4 v5  
    1111== Initial checkout == 
    1212 
    13 Identify a location in your filesystem for your working copy of the source, and change to that directory.  Then, checkout the source with the following command: 
    14 `svn co svn+ssh://svn.mit.edu/athena/trunk athena`. 
     13Identify a location in your filesystem for your working copy of the source, and change to that directory.  Then, checkout the source with `svn co` (short for `svn checkout`), as follows: 
     14{{{svn co svn+ssh://svn.mit.edu/athena/trunk athena}}} 
    1515 
    16 This will create a directory called `athena` in the current directory, with the Athena source tree inside that directory.  That directory is called a *working copy*.  
     16This will create a directory called `athena` in the current directory, with the Athena source tree inside that directory.  That directory is called a '''working copy''' or '''checkout'''.  
    1717 
    1818== Getting an update from the server == 
    1919 
    20 Before making changes, you'll want to ensure you have the latest copy of the code.  `svn update` will get you the latest copy of the code.   
     20Before making changes, you'll want to ensure you have the latest copy of the code.  `svn up` (short for `svn update`) will get you the latest copy of the code.   
    2121 
    2222{{{ 
     
    4343To remove files previously added, use `svn del`: 
    4444 
    45 `svn dell foo.pl`[[BR]] 
     45`svn del foo.pl`[[BR]] 
    4646`svn del *.c`[[BR]] 
    4747`svn del subdir`[[BR]] 
     
    4949== Reviewing your changes == 
    5050 
    51 To view information about what files have been changed, use `svn status`.  By default, it will display status on the current location in the repository, or you can specify a directory or file, or with no arguments 
     51To view information about what files have been changed, use `svn st`, short for `svn status`.  By default, it will display status on the current location in the repository; you can also specify a directory or file. 
    5252 
    53 *Tip:* Make sure you're in the right directory when you run this command.  For example, if you're working on package `foo`, but you're actually in `foo/bar`, it might not give an accurate listing of your changes to be committed. 
     53'''Tip:''' Make sure you're in the right directory when you run this command.  For example, if you're working on package `foo`, but you're actually in `foo/debian`, it will not display all your changes to the package 
    5454 
    5555Example: 
    5656{{{ 
    57 joeuser@athena:~$ svn status 
     57joeuser@athena:~$ svn st 
    5858A   foo.c 
    5959M   bar.c 
     
    7676== Committing your Changes == 
    7777 
    78 Before committing, make sure your working copy is up to date with `svn update`. 
     78Before committing, make sure your working copy is up to date with `svn up`, and make sure you are in the right directory. Just like with `svn st` or `svn diff`, Subversion will only commit changes in the current working directory and below. 
    7979 
    80 You commit your changes with `svn commit`.  You can specify files to commit, or by default it will commit everything in the current working directory and subdirectories.  It's best to run `svn status` ahead of time to verify what will be changed.  You'll also want to specify a commit message with "-m".  Commit messages should be descriptive, but concise.  Don't mention what files have changed, the commit log will tell other users that.  Instead, say what you actually did.  Example: 
     80You commit your changes with `svn commit`, or for short, `svn ci` (for "checkin").  You can specify files to commit, or by default it will commit everything in the current working directory and subdirectories.  It's best to run `svn status` ahead of time to verify what will be changed.  You'll also want to specify a commit message with "-m".  Commit messages should be descriptive, but concise.  Don't mention what files have changed, the commit log will tell other users that.  Instead, say what you actually did.  Example: 
    8181 
    8282`svn commit -m 'Fixed a string-handling bug in bar.c'` 
    8383 
    84 If you are in the root directory of a package, and have added a new Changelog entry to `debian/changelog`, you can leave the commit message blank, and the Subversion server will use the contents of the new Changelog entry as the commit message: 
     84If you are in the root directory of a package, and have added a new changelog entry to `debian/changelog`, you should leave the commit message blank. The Athena repository is configured such that the added changelog entry will become your commit message: 
    8585 
    8686`svn commit -m ''`[[BR]]