Using SVN Commands

来源:互联网 发布:array chunk php 编辑:程序博客网 时间:2024/05/06 20:08

SVN stands for Subversion.

Subversion is a free/open-source version control system. Subversion manages files and directories over time. A tree of files is placed into a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your code, or examine the history of how your code was changed.

This article explains some basic SVN commands with examples.

SVN Working Copy

SVN is a repository that holds all our versioned data, which is also called as SVN server. SVN client program which manages local reflections of portions of that versioned data which is called as working copy. SVN client can access its repository across networks. Multiple users can access the repository at the same time.

1. SVN Import - Upload working copy to repository

Commit an unversioned file or tree into the repository.

Syntax:$ svn import [PATH] URL
Recursively commit a copy of PATH to URL. If PATH is omitted, "." is assumed. Parent directories are created in the repository as necessary. Unversionable items such as device files are pipes are ignored even if --force is specified.

Options:
--auto-props--depth ARG--editor-cmd CMD--encoding ENC--file (-F) FILENAME--force--force-log--message (-m) MESSAGE--no-auto-props--no-ignore--quiet (-q)--with-revprop ARG

2. SVN Checkout – Create working copy

Checkout command is used to download sources from SVN repository to working copy. If you want to access files from the SVN server, checkout is the first operation you should perform.

SVN checkout creates the working copy, from where you can do edit, delete, or add contents. You can checkout a file, directory, trunk or whole project. To checkout you should know URL of the components you want to checkout.

Syntax:$ svn checkout/co URL[@REV] [PATH]
  • URL is the URL of the components to checkout
  • If PATH is omitted, the basename of the URL will be used as the destination. If multiple URLs are given each will be checked out into a subdirectory of PATH, with the name of the subdirectory being the basename of the URL.

Options:

--depth ARG--force--ignore-externals--quiet (-q)--revision (-r) REV




The following example checks out the directory to the given target directory.

$ svn co https://www.thegeekstuff.com/project/branches/release/migration/data/cfg /home/sasikala/cfg/A    /home/sasikala/cfg/ftp_user.cfgA    /home/sasikala/cfg/inventory.cfgA    /home/sasikala/cfg/email_user.cfgA    /home/sasikala/cfg/svn-commandsChecked out revision 811.$ ls /home/sasikala/cfg.  ..  .svn  email_user.cfg  ftp_user.cfg  inventory.cfg  svn-commands

When you do a checkout, it creates hidden directory named .svn, which will have the repository details.

3. SVN Commit – Save changes to the repository

Whenever you do changes to the working copy, it will not reflect in SVN server. To make the changes permanent, you need to do SVN commit.

Syntax:$ svn commit -m "log messages"

Explain why you are changing the file in the -m option.

For example, in my working copy, the file named “svn-commands” has the following content.

$ cat /home/sasikala/cfg/svn-commandscheckoutcommitadddeleteupdatestatus$ ls -l /home/sasikala/cfg/svn-commands-rw-r--r--  1 root root 41 Apr 16 11:15 svn-commands

I made a change in this file (for example, making this file empty).

$ ls -l svn-commands-rw-r--r--  1 root root 0 Apr 16 11:20 svn-commands

Now commit the file to make the changes permanent in the server.

$ svn commit -m "Making the file empty" svn-commandsSending        svn-commandsTransmitting file data .Committed revision 813.

After this whenever you update your working copy or checkout, the changes will appear in the server.

4. SVN List – Lists directory entries

svn list is useful when you want to view the content of the SVN repository, without downloading a working copy.

Syntax:$ svn list

The following example lists all the files available in the given URL in the repository without downloading a working copy. When you execute svn list command with –verbose option it displays the following information.

  • Revision number of the last commit
  • Author of the last commit
  • Size (in bytes)
  • Date and time of the last commit
$ svn list --verbose https://www.thegeekstuff.com/project/branches/release/migration/data/bin 16 sasikala28361 Apr 16 21:11 README.txt 21 sasikala 0 Apr 18 12:22 INSTALL 22 sasikalaApr 18 10:17 src/

5. SVN Add – Add a new file to SVN repository

When you want to add a new file (or directory) to the repository you need to use SVN add command. The repository will have newly added file, only when you do SVN commit. Now let us add a new file called “thegeekstuff” to our repository.

  • Create a file in local working copy
    $ ls -l /home/sasikala/cfg/thegeekstuff-rw-r--r--  1 sasikala root 8 Apr 16 11:33 thegeekstuff
  • Add the file into SVN repository

    svn add filename will add the files into SVN repository.

    $ svn add thegeekstuffA         thegeekstuff
  • Commit the added the file

    Until you commit, the added file will not be available in the repository.

    $ svn commit -m "Adding a file thegeekstuff" thegeekstuffAdding         thegeekstuffTransmitting file data .Committed revision 814.

6. SVN Delete – Removing a file from repository

SVN delete command deletes an item from the working copy (or repository). File will be deleted from the repository when you do a SVN commit.

Syntax:$ svn delete URL

Now let us remove the recently created file called “thegeekstuff”.

$ svn delete thegeekstuffD         thegeekstuff$ svn commit -m "Removing thegeekstuff file" thegeekstuffDeleting       thegeekstuffCommitted revision 814.

Now you can do svn list and check whether the file was deleted from the repository.

7. SVN Diff – Display the difference

SVN diff displays the differences between your working copy and the copy in the SVN repository. You can find the difference between two revisions and two paths etc.,

Syntax:$ svn diff filename$ svn -r R1:R2 diff filename

The above example compares the filename@R1 and filename@R2.

Now the content of the file thegeekstuff looks like this,

$ cat /home/sasikala/cfg/thegeekstufftesting

I edited the content of thegeekstuff file from testing to tester, which is shown below using the svn diff command.

$ svn diff thegeekstuffIndex: thegeekstuff===================================================================--- thegeekstuff   (revision 815)+++ thegeekstuff   (working copy)@@ -1 +1 @@-testing+tester

8. SVN Status – Status of the working copy

Use svn status command to get the status of the file in the working copy. It displays whether the working copy is modified, or its been added/deleted, or file is not under revision control, etc.

Syntax:$ svn status PATH

The following example shows the status of my local working copy,

$ svn status /home/sasikala/cfgM    /home/sasikala/cfg/ftp_user.cfgM      /home/sasikala/cfg/geekstuff

‘M’ represents that the item has been modified. “svn help status” command will explain various specifiers showed in SVN status command.

9. SVN Log – Display log message

As we discussed in the beginning of this article, SVN remembers every change made to your files and directories. To know all the commits made in a file or directory, use SVN log command.

Syntax:$ svn log PATH

The following displays all the commits made on thegeekstuff file

$ svn log thegeekstuff------------------------------------------------------------------------r815 | sasikala | 2011-04-16 05:14:18 -0700 (Sat, 16 Apr 2011) | 1 lineAdding a file thegeekstuff------------------------------------------------------------------------

Since we made only one commit in the file thegeekstuff, it shows only one log message with the details.

10. SVN Move – Rename file or directory

This command moves a file from one directory to another or renames a file. The file will be moved on your local sandbox immediately (as well as on the repository after committing).

Syntax:$ svn move src dest

The following command renames the file “thegeekstuff” to “tgs” in a single stroke.

$ svn move thegeekstuff tgsA         tgsD         thegeekstuff$ ls.#  ..  .svn  email_user.cfg  ftp_user.cfg  inventory.cfg  tgs

Now the file is renamed only in the working copy, not in the repository. To make the changes permanent, you need to commit the changes.

$ svn commit -m "Renaming thegeekstuff to tgs" tgsAdding         tgsTransmitting file data .Committed revision 816.

11. SVN Update – Update the working copy.

svn update command brings changes from the repository into your working copy. If no revision is specified, it brings your working copy up-to-date with the HEAD revision. Otherwise, it synchronizes the working copy to the revision given in the argument.

Always before you start working in your working copy, update your working copy. So that all the changes available in repository will be available in your working copy. i.e latest changes.

Syntax:$ svn update PATH

In case some other user added/deleted file in URL, https://www.thegeekstuff.com/project/branches/release/migration/data/cfg, your working copy will not have those files by default, until you update your working copy.

$ svn updateA  new/usercfgA  new/webcfgUpdated to revision 819.

In the above svn update command output, A represents that this file is “Added” to the working copy.



0 0
原创粉丝点击