11.07.2015 Views

Version Control with Subversion - Login

Version Control with Subversion - Login

Version Control with Subversion - Login

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

<strong>Subversion</strong> for CVS UsersStatusThe cvs status command has two purposes: first, to show the user any local modificationsin the working copy, and second, to show the user which files are out of date. Unfortunately,because of CVS's hard-to-read status output, many CVS users don't take advantageof this command at all. Instead, they've developed a habit of running cvs update orcvs -n update to quickly see their changes. If users forget to use the -n option, this hasthe side effect of merging repository changes they may not be ready to deal <strong>with</strong>.<strong>Subversion</strong> removes this muddle by making the output of svn status easy to read for bothhumans and parsers. Also, svn update prints only information about files that are updated,not local modifications.svn status prints all files that have local modifications. By default, the repository is notcontacted. While this subcommand accepts a fair number of options, the following are themost commonly used ones:-u-v-NContact the repository to determine, and then display, out-of-dateness information.Show all entries under version control.Run nonrecursively (do not descend into subdirectories).The svn status command has two output formats. In the default “short” format, local modificationslook like this:$ svn statusM foo.cM bar/baz.cIf you specify the --show-updates (-u) option, a longer output format is used:$ svn status -uM 1047 foo.c* 1045 faces.html* bloo.pngM 1050 bar/baz.cStatus against revision: 1066In this case, two new columns appear. The second column contains an asterisk if the file ordirectory is out of date. The third column shows the working copy's revision number of theitem. In the previous example, the asterisk indicates that faces.html would be patched ifwe updated, and that bloo.png is a newly added file in the repository. (The absence ofany revision number next to bloo.png means that it doesn't yet exist in the working copy.)At this point, you should take a quick look at the list of all possible status codes in svnstatus. Here are a few of the more common status codes you'll see:ADMCXResource is scheduled for AdditionResource is scheduled for DeletionResource has local ModificationsResource has Conflicts (changes have not been completely mergedbetween the repository and working copy version)Resource is eXternal to this working copy (may come from another366

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!