Changes between Version 15 and Version 16 of Doc/SCDB/Usage

Timestamp:

Oct 30, 2007, 8:06:54 PM (17 years ago)

Author:

jouvin

Comment:

Add svn status

Doc/SCDB/Usage

@@ -23 +23 @@
 
 This example assumes that the URL of template branch in SCDB repository is `http://mysvn.server.example.com/SCDB/trunk`.
+
+=== Getting Status of Working Copy ===
+
+You can get list of all the modified files in your working copy with command `svn status`. By default this command checks status of files against the base revision of the working copy but doesn't check against the repository. Thus it can be used even if you are disconnected from the network. If you want to check the status of files in the working copy against the repository, you need to add option `-u`.
+
+To be able to deploy your changes, there must be no files with uncommited changes, no files unregistered with Subversion (marked with a `?`) and no missing file (marked `!`). Also all files in the working copy must be up-to-date with repository version. All these checks are done by `ant deploy` command so there is no need to do a `svn status -u` before.
 
 === Commiting Changes ===
@@ -56 +62 @@
 To revert changes made to the working copy but not yet commited, you need to use `svn revert` command. This command requires one or several file/directory names. By default, it will revert only the given file or directory but not the directory contents. To revert a directory and all its contents (files and directories), you need to use option `--recursive`.
 
-''Note : after a `svn revert`, changes are definitely lost.''
+''Note : after a `svn revert`, changes are definitely lost. Revert only applies to files registered to Subversion : those listed with a `?` by `svn status` are not modified.''
 
 To roll back changes commited to the repository, you need to do a SVN ''merge''. This doesn't change anything in the repository but merge differences between 2 repository revisions in your working copy. To complete the rollback, you need to commit this merge, after editing some of the templates if needed. Then to deploy the rolled back configuration, you just need the [wiki:Doc/SCDB/Usage#TemplateCompilation normal procedure]. Conversely to `svn revert`, you cannot loose anything with a SVN merge : as the rolled back configuration is in the repository, you can roll it in again doing another merge.