Difference between revisions of "Subversion"

From VideoLAN Wiki
Jump to navigation Jump to search
m (Fix link: en:Patch (Unix) should be wikipedia:patch (Unix))
 
(17 intermediate revisions by 9 users not shown)
Line 1: Line 1:
'''<big><span style="color:red">This page is partially outdated. VLC and x264 have switched to [[Git]].</span></big>'''
+
{{Historical}}
 +
:''Replaced with [[Git]]''
 +
== Introduction to SVN ==
 +
Some VideoLAN's repositories are using [https://subversion.apache.org Subversion], which is a classical VCS, like CVS.
 +
It also provides a better control over the repository compared to CVS.
  
The VideoLAN's repository is using [http://subversion.tigris.org/ Subversion], which is ever so slightly trendier than CVS but provides a pretty similar interface so should not be too disruptive. It also provides a better control over the repository.
+
Note that some project, like {{VLC}} or x264 are using Git. You can read more about VideoLAN's git repository in our [[Git|Git wiki page]].
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=1 balenciaga bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=1 balenciaga handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=1 balenciaga handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=1 balenciaga]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=1 balenciaga bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe paddington]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe paddington bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe paddington bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe purse]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe paddington handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=3 chloe uk]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dolce gabbana]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dolce bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dolce gabbana handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dolce gabbana bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dolce gabbana handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dior bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dior handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 vintage dior]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 christian dior bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dior handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=5 dior uk]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=6 fendi handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=6 fendi bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=6 fendi purses]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=6 fendi hand bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=6 fendi spy bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=6 fendi bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=6 discount fendi]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci wallet]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci vintage]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci online]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci purse]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=7 gucci fashion]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=8 hermes birkin]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=8 hermes kelly bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=8 hermes bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=8 hermes bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=8 hermes birkin bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=8 hermes handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 louis vuitton handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 cheap louis vuitton]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 louis vuitton uk]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 louis vuitton]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 louis vuitton bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 buy louis vuitton]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 lv handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 louis vuitton handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 vuitton handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 louis vuitton bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=9 louis vuitton]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 mulberry bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 mulberry handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 mulberry handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 mulberry purse]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 mulberry purses]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 discount mulberry]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 discount mulberry handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 mulberry purses]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=10 mulberry bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=11 prada]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=11 prada bag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=11 prada handbag]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=11 prada handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=11 prada bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=11 prada wallets]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=11 prada hand bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=11 prada handbags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=13 gucci uk]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=13 buy gucci]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=13 gucci wallets]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=14 gucci purse]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=14 gucci fashion]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=14 cheap gucci]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=14 gucci online]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=15 prada bags]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=15 prada wallets]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=15 prada purse]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=15 prada uk]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=15 prada purse]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=16 louis vitton wallet]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=16 louis vuitton purses]
 
[http://www.zhefiry.com/webpage/servletproductlist?maintype_id=16 louis vuitton speedy]
 
[http://www.zhefiry.com/webpage/index.html handbags uk]
 
[http://www.zhefiry.com/webpage/index.html clutch bags]
 
[http://www.zhefiry.com/webpage/index.html ladies bags]
 
[http://www.zhefiry.com/webpage/index.html womens handbag]
 
[http://www.zhefiry.com/webpage/information/how_to_modify.html womens handbag]
 
[http://www.zhefiry.com/webpage/information/how_to_modify.html fashion handbag]
 
[http://www.zhefiry.com/webpage/information/how_to_modify.html luxury handbag]
 
[http://www.zhefiry.com/webpage/information/how_to_modify.html leather handbags]
 
[http://www.zhefiry.com/webpage/information/how_to_track_oder.html evening handbag]
 
[http://www.zhefiry.com/webpage/information/how_to_track_oder.html handbags online]
 
[http://www.zhefiry.com/webpage/information/how_to_track_oder.html ladies handbag]
 
[http://www.zhefiry.com/webpage/information/how_to_change_currency.html fashion handbags]
 
[http://www.zhefiry.com/webpage/information/how_to_change_currency.html handbags uk]
 
[http://www.zhefiry.com/webpage/information/how_to_change_currency.html cheap handbags]
 
[http://www.zhefiry.com/webpage/information/how_to_change_currency.html women's handbag]
 
[http://www.dragonorient.com/cheap-wedding-dress/ bridesmaids dress] 
 
[http://www.dragonorient.com/cheap-wedding-dress/ cheap wedding Dresses] 
 
[http://www.chuangliandsj.com 吊索具] 
 
[http://www.helenarubinstein.cc HR] 
 
[http://www.sako-or.cn/en/brand.php handbag] 
 
[http://www.sako-or.cn/en/brand.php ladyshoes] 
 
[http://www.sako-or.cn/en/brand.php ansun] 
 
[http://www.sako-or.cn 手袋] 
 
[http://www.sako-or.cn 女装鞋] 
 
[http://www.sako-or.cn 安信] 
 
[http://www.baili-rollforming.com/ roll forming] 
 
[http://www.baili-rollforming.com/page/chinese/ 冷弯型钢] 
 
[http://www.law-ssc.com/ 房地产律师] 
 
[http://www.law-ssc.com 合同纠纷] 
 
[http://www.gztao.net/ 糖尿病足] 
 
[http://www.cqdingyao.com/ 精密铸造] 
 
[http://www.cnjcy999.cn/ 溃疡性结肠炎] 
 
[http://www.cnjcy999.cn/ 结肠炎] 
 
[http://www.cnjcy999.cn/ 肠炎] 
 
[http://www.ks8code.com/ 条码打印机] 
 
[http://www.ks8code.com/ 条形码打印机] 
 
[http://www.jiushun.com.cn/Chinese/Bs_Products.asp 中央空调风管清洗] 
 
[http://www.jiushun.com.cn/Chinese/Bs_Products.asp 化学清洗] 
 
[http://www.jiushun.com.cn/Chinese/Bs_Product.asp 中央空调清洗] 
 
[http://www.jiushun.com.cn/Chinese/Bs_Product.asp 空调清洗] 
 
[http://www.jiushun.com.cn/ 清洗公司] 
 
[http://www.zhuoyueenglish.com/ 英语口语] 
 
[http://www.zhuoyueenglish.com 英语培训] 
 
[http://www.bjxytx.com 北京安装卫星电视] 
 
[http://www.bjxytx.com 安装卫星天线] 
 
[http://www.bjxytx.com 安装卫星电视] 
 
[http://www.chinakain.com/Product.asp 温控器] 
 
[http://www.clamandarin.com learn mandarin] 
 
[http://www.clamandarin.com learning Chinese] 
 
[http://www.clamandarin.com Chinese learn] 
 
[http://www.clamandarin.com Chinese language] 
 
[http://www.ja010.com 美术培训] 
 
[http://www.ja010.com 画室] 
 
[http://www.ja010.com 美术高考] 
 
[http://www.chieftech.net.cn/product1.asp 空气净化器] 
 
[http://www.chieftech.net.cn/product-csjs.asp 工业除湿机] 
 
[http://www.chieftech.net.cn/product-csjs.asp 抽湿机] 
 
[http://www.chieftech.net.cn/product-csjs.asp 除湿机] 
 
[http://www.wxboleda.com/ 振动试验机] 
 
[http://www.wxboleda.com/ProductShow.asp?ArticleID=92 低温试验箱] 
 
[http://www.wxboleda.com/ 高低温箱] 
 
[http://www.wxboleda.com/ 盐雾试验箱] 
 
[http://www.wxboleda.com/product.asp 盐雾箱] 
 
[http://www.wxboleda.com/ProductShow.asp?ArticleID=88 振动台] 
 
[http://www.wxboleda.com/product.asp 恒温恒湿箱] 
 
[http://www.wxboleda.com/ProductShow.asp?ArticleID=88 恒温恒湿试验箱] 
 
[http://www.wxboleda.com/ProductShow.asp?ArticleID=92 高低温试验箱] 
 
[http://www.yanzifei.cn 生活随笔]
 
[http://www.yanzifei.cn 工作感想]
 
Note that there is also a git mirror of the Subversion tree. You can read more about VideoLAN's git repository in our [[Git|Git wiki page]].
 
  
Currently the Subversion repository is hosted on one of the [[VideoLAN Servers]].
+
'''Currently the Subversion repositories are discontinued on VideoLAN.'''
  
To use it, you have to download the [http://subversion.tigris.org/ official command line Subversion client]. You can also use alternative clients, such as the graphical [http://tortoisesvn.tigris.org/ TortoiseSVN] for Windows. When using [[Cygwin]] as compilation environment it is recommended to use the SVN package that comes with it (using the Cygwin setup). Using an "external" SVN application might otherwise cause problems with so called DOS versus UNIX "line endings" when creating files.
+
=== How to use it ===
 +
To use it, you have to download the [https://subversion.apache.org official command line Subversion client]. You can also use alternative clients, such as the graphical [http://tortoisesvn.tigris.org/ TortoiseSVN] for Windows.
 +
 
 +
When using [[Cygwin]] as compilation environment it is recommended to use the SVN package that comes with it (using the Cygwin setup). Using an "external" SVN application might otherwise cause problems with so called DOS versus UNIX "line endings" when creating files.
  
 
Subversion's command-line interface is generally pretty similar to CVS. This is a '''basic''' and partial guide of the most useful commands. For a complete guide, use the book [http://svnbook.red-bean.com/en/1.2/index.html Version Control with Subversion]. If you have a write access to the server, it's very recommended that you read it and know about the advanced features of Subversion, because you might use them sooner or later.
 
Subversion's command-line interface is generally pretty similar to CVS. This is a '''basic''' and partial guide of the most useful commands. For a complete guide, use the book [http://svnbook.red-bean.com/en/1.2/index.html Version Control with Subversion]. If you have a write access to the server, it's very recommended that you read it and know about the advanced features of Subversion, because you might use them sooner or later.
Line 177: Line 23:
 
  {{%}} <nowiki>svn checkout svn://svn.videolan.org/libdvbpsi/trunk libdvbpsi-trunk</nowiki>
 
  {{%}} <nowiki>svn checkout svn://svn.videolan.org/libdvbpsi/trunk libdvbpsi-trunk</nowiki>
  
You can browse the code structure using the [http://trac.videolan.org/libdvbpsi/browser VideoLAN Trac's web interface] ([http://trac.edgewall.org Trac]).
+
You can browse the code structure using on the [http://svn.videolan.org SVN webviewer]
 
Use the three folders there for different purposes:
 
Use the three folders there for different purposes:
* [http://trac.videolan.org/vlc/browser/trunk Trunk] is the main development branch.
+
* {{SVNSourceFile|name=trunk|repo=libdvbpsi}} is the main development branch.
* The [http://trac.videolan.org/vlc/browser/branches branches] are used for stable versions and for the development of complex features.
+
* The {{SVNSourceFile|name=branches|repo=libdvbpsi}} are used for stable versions and for the development of complex features.
* The [http://trac.videolan.org/vlc/browser/tags tags] are used to track the released versions.
+
* The {{SVNSourceFile|name=tags|repo=libdvbpsi}} are used to track the released versions.
  
 
The URL structure is:
 
The URL structure is:
  
 
; transport : svn://svn.videolan.org
 
; transport : svn://svn.videolan.org
; project repository : /vlc
+
; project repository : /libdvbpsi
 
; branch/tag : /trunk, or /branches/0.8.6, or /tags/0.8.5
 
; branch/tag : /trunk, or /branches/0.8.6, or /tags/0.8.5
 
; files : /README
 
; files : /README
Line 196: Line 42:
 
=== Projects on VideoLAN's SVN ===
 
=== Projects on VideoLAN's SVN ===
  
* '''svn://svn.videolan.org/vls''': VideoLAN Server (deprecated and unmaintained : {{VLC}} can now do the same);
+
All projects from VideoLAN SVN are moved to gitlab on code.videolan.org.
* '''svn://svn.videolan.org/libdvdcss''': library for decrypting DVDs, used by {{VLC}} and VLS;
 
* '''svn://svn.videolan.org/libdvdplay''': library for DVD navigation, used by {{VLC}};
 
* '''svn://svn.videolan.org/libdvbpsi''': library for parsing Program Specific Information from MPEG and DVB streams, used by VLC and VLS;
 
* '''svn://svn.videolan.org/videolan/www.videolan.org''': the website (no trunk or branches);
 
* '''svn://svn.videolan.org/videolan/developers.videolan.org''': the developers website (no trunk or branches);
 
* '''svn://svn.videolan.org/libmpeg2''': MPEG2 library.
 
* '''svn://svn.videolan.org/liba52''': A52/AC3 decoder library.
 
* '''svn://svn.videolan.org/libdvbcsa''':  DVB Common Scrambling Algorithm library
 
  
 
=== Updating the working copy ===
 
=== Updating the working copy ===
Line 228: Line 66:
  
 
=== Applying a diff ===
 
=== Applying a diff ===
Subversion does not contain a built in command to apply diffs to the current working copy (for example, to review or commit diffs published in Bugzilla); instead, you can use the regular [[:en:Patch (Unix)|patch]] unix utility:
+
Subversion does not contain a built in command to apply diffs to the current working copy (for example, to review or commit diffs published in Bugzilla); instead, you can use the regular [[wikipedia:patch (Unix)|patch]] unix utility:
 
  {{%}} patch -p0 < patch
 
  {{%}} patch -p0 < patch
  
Line 285: Line 123:
 
=== Checking out specific revision number ===
 
=== Checking out specific revision number ===
 
You can check specific repository revision using following command :
 
You can check specific repository revision using following command :
  {{%}} svn checkout -r 12345 svn://svn.videolan.org/vlc/trunk vlc-trunk
+
  {{%}} svn checkout -r 12345 svn://svn.videolan.org/libdvbpsi/trunk libdvbpsi-trunk
  
 
== Developer use ==
 
== Developer use ==
If you have a write access for the server, you can use an SSH access instead of HTTP access. This might change later.
+
If you have a write access for the server, you can use an SSH access instead of HTTP access.
  
 
=== Commits ===
 
=== Commits ===
Line 306: Line 144:
  
 
== External links ==
 
== External links ==
* [http://trac.videolan.org/vlc/browser/trunk Subversion Web access]
+
* [http://svn.videolan.org Subversion Web access]
 
* [http://svnbook.red-bean.com/en/1.2/index.html Version Control with Subversion] book (SVN version 1.2)
 
* [http://svnbook.red-bean.com/en/1.2/index.html Version Control with Subversion] book (SVN version 1.2)
  
 
[[Category:Building]] [[Category:Coding]]
 
[[Category:Building]] [[Category:Coding]]

Latest revision as of 07:37, 12 March 2019

This page is obsolete and kept only for historical interest. It may document features that are obsolete, superseded, or irrelevant. Do not rely on the information here being up-to-date.
Replaced with Git

Introduction to SVN

Some VideoLAN's repositories are using Subversion, which is a classical VCS, like CVS. It also provides a better control over the repository compared to CVS.

Note that some project, like VLC media player or x264 are using Git. You can read more about VideoLAN's git repository in our Git wiki page.

Currently the Subversion repositories are discontinued on VideoLAN.

How to use it

To use it, you have to download the official command line Subversion client. You can also use alternative clients, such as the graphical TortoiseSVN for Windows.

When using Cygwin as compilation environment it is recommended to use the SVN package that comes with it (using the Cygwin setup). Using an "external" SVN application might otherwise cause problems with so called DOS versus UNIX "line endings" when creating files.

Subversion's command-line interface is generally pretty similar to CVS. This is a basic and partial guide of the most useful commands. For a complete guide, use the book Version Control with Subversion. If you have a write access to the server, it's very recommended that you read it and know about the advanced features of Subversion, because you might use them sooner or later.

Anonymous use

If you don't have a write access to the repository, you have to access it anonymously, via regular SVN. However, most of the techniques shown here may be useful also for developer use, so please read it even if you don't have to access the server anonymously.

Check out

First, you have to check out the code of libdvbpsi. Use the following syntax:

% svn checkout svn://svn.videolan.org/libdvbpsi/trunk libdvbpsi-trunk

You can browse the code structure using on the SVN webviewer Use the three folders there for different purposes:

  • trunk is the main development branch.
  • The branches are used for stable versions and for the development of complex features.
  • The tags are used to track the released versions.

The URL structure is:

transport 
svn://svn.videolan.org
project repository 
/libdvbpsi
branch/tag 
/trunk, or /branches/0.8.6, or /tags/0.8.5
files 
/README

You can also checkout a portion of the SVN using the URL.

Don't leave off the "trunk" or branch part! If you leave that off you check out every revision of every file in the repo, which is pretty silly.

Projects on VideoLAN's SVN

All projects from VideoLAN SVN are moved to gitlab on code.videolan.org.

Updating the working copy

To update your working copy and get the latest files, use the following command:

% svn update

Note that SVN, unlike CVS, doesn't need to be told to prune removed files or create new directories. This is automagic.

Making a diff

Diffs, or patches, are text files which include all the changes done in the working copy. If you suggest a new feature or like to suggest a change, send a patch to the mailing-list with [PATCH] in the subject.

To create a diff from the current repository, use the following command:

% svn diff

Normally, unlike CVS, you don't have to tell SVN which files you changed; however, you may like to diff only a part of the repository. To do that, specify the files to diff:

% svn diff modules/gui/qt4/qt4.hpp

Note that SVN defaults to the "unified" diff format, so the "-u" option doesn't have to be passed.

Applying a diff

Subversion does not contain a built in command to apply diffs to the current working copy (for example, to review or commit diffs published in Bugzilla); instead, you can use the regular patch unix utility:

% patch -p0 < patch

TortoiseSVN has a built-in support for applying a diff.

.cvsignore / Ignoring files

You can ignore some files, using metadata:

% svn propedit svn:ignore mydirectory

Changing file structure

Add a file

You can add files or folders to the working copy, to be included in the next diff or commit, using the command:

% svn add file.name

If file.name is a text-based document, you should do

% svn propset svn:eol-style native file.name

If you add a folder, it will add all the files included in the folder, except for files in the ignored list.

Delete a file

You can delete files or folders from the working copy, to be deleted in the next commit or marked as such in the next diff, using the command (which will automatically delete the files from the working copy, but won't delete folders in such way):

% svn delete file.name

Make sure the file or folder do not have local modifications, else they won't be deleted unless you force the deletion.

Move a file

You no longer create new files from scratch when moving files!

% svn mv file1 file2

You can also do it with entire folders.

Reverting your changes

If your changes in the working copy are not useful in your opinion, you can revert them using the following command:

% svn revert

You must use parameters for this command. To revert all your changes in the working copy, use:

% svn revert -R .

To revert the changes in a specific file, use:

% svn revert file.name

Reverting can also remove added files (they won't be deleted, just removed and considered "unknown files", just like you didn't use svn add at first), and restore deleted files (both deleted by hand and deleted by svn delete).

Checking the status of the working copy

You can check the status of your working copy using the following command:

% svn status

These are several important letters in the first column of the item, which show the status:

  • M = the item was modified by you
  • A = the item was added by you (using svn add)
  • D = the item was deleted by you (using svn delete)
  •  ? = the item is not under the version control, but exist
  •  ! = the item is missing (under the version control, but not exist - probably deleted without using svn delete) or incomplete

Checking out specific revision number

You can check specific repository revision using following command :

% svn checkout -r 12345 svn://svn.videolan.org/libdvbpsi/trunk libdvbpsi-trunk

Developer use

If you have a write access for the server, you can use an SSH access instead of HTTP access.

Commits

Commits, or check ins, are the action of applying your changes from the working copy to the web repository. Use the following command to do that:

% svn commit

Using the command without the parameters will fail, unless you've configured an editor, because you have to enter a comment for the file logs. You can use one of the following forms:

% svn commit --message="This is the log comment."
% svn commit --file=file_with_log_comment

Other commands

% svn export
% svn propedit

Are documented in the SVN Book that you should definitively read.

External links