… When you're concatenating the results of multiple calls to the log command, you may want to use the incremental option. svn log normally prints out a dashed line at the beginning of a log message, after each subsequent log message, and following the final log message. If you ran svn log on a range of two revisions, you would get this: $ svn log -r 14:15 r14 | … r15 | … However, if you wanted to gather 2 non-sequential log messages into a file, you might do something like this: $ svn log -r 14 > mylog $ svn log -r 19 >> mylog $ svn log -r 27 >> mylog $ cat mylog r14 | … r19 | … r27 | … You can avoid the clutter of the double dashed lines in your output by using the incremental option: $ svn log incremental -r 14 > mylog $ svn log incremental -r 19 >> mylog $ svn log incremental -r 27 >> mylog $ cat mylog r14 | … r19 | … r27 | … The incremental option provides similar output control when using the xml option. Subversion Complete Reference 238 If you run svn log on a specific path and provide a specific revision and get no output at all $ svn log -r 20 http://svn.red-bean.com/untouched.txt That just means that the path was not modified in that revision. If you log from the top of the repository, or know the file that changed in that revision, you can specify it explicitly: $ svn log -r 20 touched.txt r20 | sally | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line Made a change. Subversion Complete Reference 239 Name svn merge — Apply the differences between two sources to a working copy path. Synopsis svn merge [-c M | -r N:M] SOURCE[@REV] [WCPATH] svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH] svn merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH] Description In the first and second forms, the source paths (URLs in the first form, working copy paths in the second) are specified at revisions N and M. These are the two sources to be compared. The revisions default to HEAD if omitted. The -c M option is equivalent to -r N:M where N = M-1. Using -c -M does the reverse: -r M:N where N = M-1. In the third form, SOURCE can be a URL or working copy item, in which case the corresponding URL is used. This URL, at revisions N and M, defines the two sources to be compared. WCPATH is the working copy path that will receive the changes. If WCPATH is omitted, a default value of “.” is assumed, unless the sources have identical basenames that match a file within “.”: in which case, the differences will be applied to that file. Unlike svn diff, the merge command takes the ancestry of a file into consideration when per- forming a merge operation. This is very important when you're merging changes from one branch into another and you've renamed a file on one branch but not the other. Alternate Names None Changes Working copy Accesses Repository Only if working with URLs Options revision (-r) REV change (-c) REV non-recursive (-N) quiet (-q) force dry-run diff3-cmd CMD extensions (-x) ARG Subversion Complete Reference 240 ignore-ancestry username USER password PASS no-auth-cache non-interactive config-dir DIR Examples Merge a branch back into the trunk (assuming that you have a working copy of the trunk, and that the branch was created in revision 250): $ svn merge -r 250:HEAD http://svn.red-bean.com/repos/branches/my-branch U myproj/tiny.txt U myproj/thhgttg.txt U myproj/win.txt U myproj/flo.txt If you branched at revision 23, and you want to merge changes on trunk into your branch, you could do this from inside the working copy of your branch: $ svn merge -r 23:30 file:///tmp/repos/trunk/vendors U myproj/thhgttg.txt … To merge changes to a single file: $ cd myproj $ svn merge -r 30:31 thhgttg.txt U thhgttg.txt Subversion Complete Reference 241 Name svn mkdir — Create a new directory under version control. Synopsis svn mkdir PATH svn mkdir URL Description Create a directory with a name given by the final component of the PATH or URL. A directory specified by a working copy PATH is scheduled for addition in the working copy. A directory specified by a URL is created in the repository via an immediate commit. Multiple directory URLs are committed atomically. In both cases all the intermediate directories must already ex- ist. Alternate Names None Changes Working copy, repository if operating on a URL Accesses Repository Only if operating on a URL Options message (-m) TEXT file (-F) FILE quiet (-q) username USER password PASS no-auth-cache non-interactive editor-cmd EDITOR encoding ENC force-log config-dir DIR Examples Create a directory in your working copy: $ svn mkdir newdir A newdir Create one in the repository (instant commit, so a log message is required): Subversion Complete Reference 242 $ svn mkdir -m "Making a new dir." http://svn.red-bean.com/repos/newdir Committed revision 26. Subversion Complete Reference 243 Name svn move — Move a file or directory. Synopsis svn move SRC DST Description This command moves a file or directory in your working copy or in the repository. This command is equivalent to an svn copy followed by svn delete. Subversion does not support moving between working copies and URLs. In addi- tion, you can only move files within a single repository—Subversion does not sup- port cross-repository moving. WC -> WC Move and schedule a file or directory for addition (with history). URL -> URL Complete server-side rename. Alternate Names mv, rename, ren Changes Working copy, repository if operating on a URL Accesses Repository Only if operating on a URL Options message (-m) TEXT file (-F) FILE revision (-r) REV (Deprecated) quiet (-q) force username USER password PASS no-auth-cache non-interactive editor-cmd EDITOR encoding ENC force-log config-dir DIR Subversion Complete Reference 244 Examples Move a file in your working copy: $ svn move foo.c bar.c A bar.c D foo.c Move a file in the repository (an immediate commit, so it requires a commit message): $ svn move -m "Move a file" http://svn.red-bean.com/repos/foo.c \ http://svn.red-bean.com/repos/bar.c Committed revision 27. Subversion Complete Reference 245 Name svn propdel — Remove a property from an item. Synopsis svn propdel PROPNAME [PATH ] svn propdel PROPNAME revprop -r REV [TARGET] Description This removes properties from files, directories, or revisions. The first form removes versioned properties in your working copy, while the second removes unversioned remote properties on a repository revision (TARGET only determines which repository to access). Alternate Names pdel, pd Changes Working copy, repository only if operating on a URL Accesses Repository Only if operating on a URL Options quiet (-q) recursive (-R) revision (-r) REV revprop username USER password PASS no-auth-cache non-interactive config-dir DIR Examples Delete a property from a file in your working copy $ svn propdel svn:mime-type some-script property 'svn:mime-type' deleted from 'some-script'. Delete a revision property: $ svn propdel revprop -r 26 release-date property 'release-date' deleted from repository revision '26' Subversion Complete Reference 246 Name svn propedit — Edit the property of one or more items under version control. Synopsis svn propedit PROPNAME PATH svn propedit PROPNAME revprop -r REV [TARGET] Description Edit one or more properties using your favorite editor. The first form edits versioned properties in your working copy, while the second edits unversioned remote properties on a repository re- vision (TARGET only determines which repository to access). Alternate Names pedit, pe Changes Working copy, repository only if operating on a URL Accesses Repository Only if operating on a URL Options revision (-r) REV revprop username USER password PASS no-auth-cache non-interactive encoding ENC editor-cmd EDITOR config-dir DIR Examples svn propedit makes it easy to modify properties that have multiple values: $ svn propedit svn:keywords foo.c <svn will launch your favorite editor here, with a buffer open containing the current contents of the svn:keywords property. You can add multiple values to a property easily here by entering one value per line.> Set new value for property 'svn:keywords' on 'foo.c' Subversion Complete Reference 247 [...]... exists in current versions of Subversion only for historical reasons This command is deprecated and no longer needed It dates from a time when Subversion offered administrators greater control over compression strategies in the repository This turned out to be a lot of complexity for very little gain, and this “feature” was deprecated Options revision (-r) REV quiet (-q) 271 Subversion Complete Reference... $ svnadmin create /usr/local/svn/repos In Subversion 1.0, a Berkeley DB repository is always created In Subversion 1.1, a Berkeley DB repository is the default repository type, but an FSFS repository can be created using the -fs-type option: $ svnadmin create /usr/local/svn/repos fs-type fsfs 1 Remember, svnadmin works only with local paths, not URLs 270 Subversion Complete Reference Name svnadmin... property: 2 48 Subversion Complete Reference $ svn propget svn:log revprop -r 20 Began journal 249 Subversion Complete Reference Name svn proplist — List all properties Synopsis svn proplist [TARGET[@REV] ] svn proplist revprop -r REV [TARGET] Description List all properties on files, directories, or revisions The first form lists versioned properties in your working copy, while the second lists unversioned... information you can get out of the status subcommand: $ svn status show-updates verbose wc M 965 9 38 sally wc/bar.c * 965 922 harry wc/foo.c A + 965 687 harry wc/qax.c 965 687 harry wc/zig.c Head revision: 981 For many more examples of svn status, see the section called “See an overview of your changes” 261 Subversion Complete Reference Name svn switch — Update working copy to a different URL Synopsis svn... you need to restore from a catastrophic repository failure 2 68 Subversion Complete Reference bdb-txn-nosync (Berkeley DB specific) Disables fsync when committing database transactions Used with the svnadmin create command to create a Berkeley DB backed repository with DB_TXN_NOSYNC enabled (which improves speed but has some risks associated with it) bypass-hooks Bypass the repository hook system clean-logs... directories, or revisions The first example creates a versioned, local property change in the working copy, and the second creates an unversioned, remote property change on a repository revision (TARGET only determines which repository to access) Subversion has a number of “special” properties that affect its behavior See the section called Subversion properties” for more on these properties Alternate... then a new file with the same name was scheduled for addition in its place 'C' The contents (as opposed to the properties) of the item conflict with updates received from the repository 'X' Item is present because of an externals definition 'I' Item is being ignored (e.g with the svn:ignore property) '?' Item is not under version control '!' Item is missing (e.g you moved or deleted it without using... 'tree.jpg' is not locked in this working copy $ svn unlock force tree.jpg 'tree.jpg' unlocked 265 Subversion Complete Reference Unlock a file without a working copy: $ svn unlock http://svn.red-bean.com/repos/test/tree.jpg 'tree.jpg unlocked For further details, see the section called “Locking” 266 Subversion Complete Reference Name svn update — Update your working copy Synopsis svn update [PATH ]... foo.c Properties on 'foo.c': svn:mime-type svn:keywords owner But with the verbose flag, svn proplist is extremely handy as it also shows you the values for the properties: 250 Subversion Complete Reference $ svn proplist verbose foo.c Properties on 'foo.c': svn:mime-type : text/plain svn:keywords : Author Date Rev owner : sally 251 Subversion Complete Reference Name svn propset — Set PROPNAME to PROPVAL... terminate the load process svnadmin Subcommands 269 Subversion Complete Reference Name svnadmin create — Create a new, empty repository Synopsis svnadmin create REPOS_PATH Description Create a new, empty repository at the path provided If the provided directory does not exist, it will be created for you.1 As of Subversion 1.2, svnadmin creates new repositories with the fsfs filesystem backend by default Options . thhgttg.txt Subversion Complete Reference 241 Name svn mkdir — Create a new directory under version control. Synopsis svn mkdir PATH svn mkdir URL Description Create a directory with a name. copy followed by svn delete. Subversion does not support moving between working copies and URLs. In addi- tion, you can only move files within a single repository Subversion does not sup- port. foo.c Author Date Rev The same goes for a revision property: Subversion Complete Reference 2 48 $ svn propget svn:log revprop -r 20 Began journal. Subversion Complete Reference 249 Name svn proplist — List