lej:tmp loewis$ cd svndemo/ lej:svndemo loewis$ ls lej:svndemo loewis$ mkdir a1 lej:svndemo loewis$ cd a1/ lej:a1 loewis$ vim a.py lej:a1 loewis$ ls a.py lej:a1 loewis$ cd .. lej:svndemo loewis$ ls a1 lej:svndemo loewis$ svn import svn: Try 'svn help' for more info svn: Repository URL required when importing lej:svndemo loewis$ svn import --help import: Commit an unversioned file or tree into the repository. usage: import [PATH] URL Recursively commit a copy of PATH to URL. If PATH is omitted '.' is assumed. Parent directories are created as necessary in the repository. If PATH is a directory, the contents of the directory are added directly under URL. Unversionable items such as device files and pipes are ignored if --force is specified. Valid options: -q [--quiet] : print nothing, or only summary information -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates --depth ARG : limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity') --auto-props : enable automatic properties --force : force operation to run --no-auto-props : disable automatic properties -m [--message] ARG : specify log message ARG -F [--file] ARG : read log message from file ARG --force-log : force validity of log message source --editor-cmd ARG : use ARG as external editor --encoding ARG : treat value as being in charset encoding ARG --with-revprop ARG : set revision property ARG in new revision using the name[=value] format --no-ignore : disregard default and svn:ignore property ignores Global options: --username ARG : specify a username ARG --password ARG : specify a password ARG --no-auth-cache : do not cache authentication tokens --non-interactive : do no interactive prompting --trust-server-cert : accept unknown SSL server certificates without prompting (but only with '--non-interactive') --config-dir ARG : read user configuration files from directory ARG --config-option ARG : set user configuration option in the format: FILE:SECTION:OPTION=[VALUE] For example: servers:global:http-library=serf lej:svndemo loewis$ lej:svndemo loewis$ svn import a1 https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1/ Adding a1/a.py Committed revision 1. lej:svndemo loewis$ svn rm https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1/a.py Committed revision 2. lej:svndemo loewis$ svn import a1 https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1/a1 Adding a1/a.py Committed revision 3. lej:svndemo loewis$ ls a1 lej:svndemo loewis$ rm -rf a1/ lej:svndemo loewis$ ls lej:svndemo loewis$ svn --help usage: svn [options] [args] Subversion command-line client, version 1.6.5. Type 'svn help ' for help on a specific subcommand. Type 'svn --version' to see the program version and RA modules or 'svn --version --quiet' to see just the version number. Most subcommands take file and/or directory arguments, recursing on the directories. If no arguments are supplied to such a command, it recurses on the current directory (inclusive) by default. Available subcommands: add blame (praise, annotate, ann) cat changelist (cl) checkout (co) cleanup commit (ci) copy (cp) delete (del, remove, rm) diff (di) export help (?, h) import info list (ls) lock log merge mergeinfo mkdir move (mv, rename, ren) propdel (pdel, pd) propedit (pedit, pe) propget (pget, pg) proplist (plist, pl) propset (pset, ps) resolve resolved revert status (stat, st) switch (sw) unlock update (up) Subversion is a tool for version control. For additional information, see http://subversion.tigris.org/ lej:svndemo loewis$ svn co https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1/a1/ A a1/a.py Checked out revision 3. lej:svndemo loewis$ ls a1 lej:svndemo loewis$ ls a1/ a.py lej:svndemo loewis$ ls -a a1/ . .. .svn a.py lej:svndemo loewis$ cd a1/ lej:a1 loewis$ ls a.py lej:a1 loewis$ cd a1 -bash: cd: a1: No such file or directory lej:a1 loewis$ ls a.py lej:a1 loewis$ vim a.py lej:a1 loewis$ svn status M a.py lej:a1 loewis$ svn commit Sending a.py Transmitting file data . Committed revision 4. lej:a1 loewis$ vim a.py lej:a1 loewis$ svn status M a.py lej:a1 loewis$ svn diff a.py Index: a.py =================================================================== --- a.py (revision 4) +++ a.py (working copy) @@ -1,2 +1,5 @@ -print "Hallo, Welt!" +if language == 'German': + print "Hallo, Welt!" +else: + print "Hello, world!" lej:a1 loewis$ svn commit Sending a.py Transmitting file data . Committed revision 5. lej:a1 loewis$ svn diff a.py lej:a1 loewis$ vim a.py lej:a1 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 5) +++ a.py (working copy) @@ -1,4 +1,5 @@ if language == 'German': + print "Testing 1.2.3" print "Hallo, Welt!" else: print "Hello, world!" lej:a1 loewis$ svn log a.py ------------------------------------------------------------------------ r5 | Martin von Loewis | 2010-01-04 18:04:56 +0100 (Mo, 04 Jan 2010) | 2 lines Make language conditional. ------------------------------------------------------------------------ r4 | Martin von Loewis | 2010-01-04 18:00:35 +0100 (Mo, 04 Jan 2010) | 2 lines Translate message to German. ------------------------------------------------------------------------ r3 | Martin von Loewis | 2010-01-04 17:56:19 +0100 (Mo, 04 Jan 2010) | 2 lines Initial import. ------------------------------------------------------------------------ lej:a1 loewis$ svn diff -r3:4 a.py Index: a.py =================================================================== --- a.py (revision 3) +++ a.py (revision 4) @@ -1,2 +1,2 @@ -print "Hello, world!" +print "Hallo, Welt!" lej:a1 loewis$ svn annotate a.py 5 Martin von Loewis if language == 'German': 5 Martin von Loewis print "Hallo, Welt!" 5 Martin von Loewis else: 5 Martin von Loewis print "Hello, world!" 3 Martin von Loewis lej:a1 loewis$ vim a.py lej:a1 loewis$ svn commit Sending a.py Transmitting file data . Committed revision 6. lej:a1 loewis$ svn annotate a.py 5 Martin von Loewis if language == 'German': 6 Martin von Loewis print "Hallo, Welt" 5 Martin von Loewis else: 6 Martin von Loewis print "Hello, world" 3 Martin von Loewis lej:a1 loewis$ svn --help usage: svn [options] [args] Subversion command-line client, version 1.6.5. Type 'svn help ' for help on a specific subcommand. Type 'svn --version' to see the program version and RA modules or 'svn --version --quiet' to see just the version number. Most subcommands take file and/or directory arguments, recursing on the directories. If no arguments are supplied to such a command, it recurses on the current directory (inclusive) by default. Available subcommands: add blame (praise, annotate, ann) cat changelist (cl) checkout (co) cleanup commit (ci) copy (cp) delete (del, remove, rm) diff (di) export help (?, h) import info list (ls) lock log merge mergeinfo mkdir move (mv, rename, ren) propdel (pdel, pd) propedit (pedit, pe) propget (pget, pg) proplist (plist, pl) propset (pset, ps) resolve resolved revert status (stat, st) switch (sw) unlock update (up) Subversion is a tool for version control. For additional information, see http://subversion.tigris.org/ lej:a1 loewis$ lej:a1 loewis$ svn annotate a.py 5 Martin von Loewis if language == 'German': 6 Martin von Loewis print "Hallo, Welt" 5 Martin von Loewis else: 6 Martin von Loewis print "Hello, world" 3 Martin von Loewis lej:a1 loewis$ svn log -r6 ------------------------------------------------------------------------ r6 | Martin von Loewis | 2010-01-04 18:08:37 +0100 (Mo, 04 Jan 2010) | 2 lines Remove exclamation marks. ------------------------------------------------------------------------ lej:a1 loewis$ ls a.py lej:a1 loewis$ svn b.py Unknown command: 'b.py' Type 'svn help' for usage. lej:a1 loewis$ def b.p lej:a1 loewis$ vim b.py lej:a1 loewis$ svn status ? b.py lej:a1 loewis$ svn add b.py A b.py lej:a1 loewis$ svn b.py Unknown command: 'b.py' Type 'svn help' for usage. lej:a1 loewis$ svn status A b.py lej:a1 loewis$ vim a.py lej:a1 loewis$ svn commit Sending a.py Adding b.py Transmitting file data .. Committed revision 7. lej:a1 loewis$ svn log -v ------------------------------------------------------------------------ r3 | Martin von Loewis | 2010-01-04 17:56:19 +0100 (Mo, 04 Jan 2010) | 2 lines Changed paths: A /a1 A /a1/a.py Initial import. ------------------------------------------------------------------------ lej:a1 loewis$ svn up At revision 7. lej:a1 loewis$ svn log ------------------------------------------------------------------------ r7 | Martin von Loewis | 2010-01-04 18:14:30 +0100 (Mo, 04 Jan 2010) | 3 lines Add wrapper module b. Restore exclamation marks. ------------------------------------------------------------------------ r6 | Martin von Loewis | 2010-01-04 18:08:37 +0100 (Mo, 04 Jan 2010) | 2 lines Remove exclamation marks. ------------------------------------------------------------------------ r5 | Martin von Loewis | 2010-01-04 18:04:56 +0100 (Mo, 04 Jan 2010) | 2 lines Make language conditional. ------------------------------------------------------------------------ r4 | Martin von Loewis | 2010-01-04 18:00:35 +0100 (Mo, 04 Jan 2010) | 2 lines Translate message to German. ------------------------------------------------------------------------ r3 | Martin von Loewis | 2010-01-04 17:56:19 +0100 (Mo, 04 Jan 2010) | 2 lines Initial import. ------------------------------------------------------------------------ lej:a1 loewis$ svn log -v ------------------------------------------------------------------------ r7 | Martin von Loewis | 2010-01-04 18:14:30 +0100 (Mo, 04 Jan 2010) | 3 lines Changed paths: M /a1/a.py A /a1/b.py Add wrapper module b. Restore exclamation marks. ------------------------------------------------------------------------ r6 | Martin von Loewis | 2010-01-04 18:08:37 +0100 (Mo, 04 Jan 2010) | 2 lines Changed paths: M /a1/a.py Remove exclamation marks. ------------------------------------------------------------------------ r5 | Martin von Loewis | 2010-01-04 18:04:56 +0100 (Mo, 04 Jan 2010) | 2 lines Changed paths: M /a1/a.py Make language conditional. ------------------------------------------------------------------------ r4 | Martin von Loewis | 2010-01-04 18:00:35 +0100 (Mo, 04 Jan 2010) | 2 lines Changed paths: M /a1/a.py Translate message to German. ------------------------------------------------------------------------ r3 | Martin von Loewis | 2010-01-04 17:56:19 +0100 (Mo, 04 Jan 2010) | 2 lines Changed paths: A /a1 A /a1/a.py Initial import. ------------------------------------------------------------------------ lej:a1 loewis$ lej:a1 loewis$ ls a.py b.py lej:a1 loewis$ cd .. lej:svndemo loewis$ svn co https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1/a1/ a2 A a2/a.py A a2/b.py Checked out revision 7. lej:svndemo loewis$ ls a1/ a.py b.py lej:svndemo loewis$ ls a2 a.py b.py lej:svndemo loewis$ ls a1 a2 lej:svndemo loewis$ cd a2/ lej:a2 loewis$ cd ../a1/ lej:a1 loewis$ ls a.py b.py lej:a1 loewis$ pwd /Users/loewis/tmp/svndemo/a1 lej:a1 loewis$ vim b.py lej:a1 loewis$ cd ../a2/ lej:a2 loewis$ vim a.py lej:a2 loewis$ vim b.py lej:a2 loewis$ python b.py Hallo, Welt! Done lej:a2 loewis$ svn diff |less lej:a2 loewis$ svn commit Sending a.py Sending b.py Transmitting file data .. Committed revision 8. lej:a2 loewis$ cd ../a1/ lej:a1 loewis$ svn diff Index: b.py =================================================================== --- b.py (revision 7) +++ b.py (working copy) @@ -1,3 +1,3 @@ import a -print "Done" +print "Fertig" lej:a1 loewis$ svn commit Sending b.py svn: Commit failed (details follow): svn: File or directory 'b.py' is out of date; try updating svn: resource out of date; try updating svn: Your commit message was left in a temporary file: svn: '/Users/loewis/tmp/svndemo/a1/svn-commit.tmp' lej:a1 loewis$ svn update U a.py G b.py Updated to revision 8. lej:a1 loewis$ vim b.py lej:a1 loewis$ svn diff b.py Index: b.py =================================================================== --- b.py (revision 8) +++ b.py (working copy) @@ -1,4 +1,4 @@ import a a.message('German') -print "Done" +print "Fertig" lej:a1 loewis$ svn commit Sending b.py Transmitting file data . Committed revision 9. lej:a1 loewis$ svn ls https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1 a1/ lej:a1 loewis$ svn ls --help list (ls): List directory entries in the repository. usage: list [TARGET[@REV]...] List each TARGET file and the contents of each TARGET directory as they exist in the repository. If TARGET is a working copy path, the corresponding repository URL will be used. If specified, REV determines in which revision the target is first looked up. The default TARGET is '.', meaning the repository URL of the current working directory. With --verbose, the following fields will be shown for each item: Revision number of the last commit Author of the last commit If locked, the letter 'O'. (Use 'svn info URL' to see details) Size (in bytes) Date and time of the last commit Valid options: -r [--revision] ARG : ARG (some commands also take ARG1:ARG2 range) A revision argument can be one of: NUMBER revision number '{' DATE '}' revision at start of the date 'HEAD' latest in repository 'BASE' base rev of item's working copy 'COMMITTED' last commit at or before BASE 'PREV' revision just before COMMITTED -v [--verbose] : print extra information -R [--recursive] : descend recursively, same as --depth=infinity --depth ARG : limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity') --incremental : give output suitable for concatenation --xml : output in XML Global options: --username ARG : specify a username ARG --password ARG : specify a password ARG --no-auth-cache : do not cache authentication tokens --non-interactive : do no interactive prompting --trust-server-cert : accept unknown SSL server certificates without prompting (but only with '--non-interactive') --config-dir ARG : read user configuration files from directory ARG --config-option ARG : set user configuration option in the format: FILE:SECTION:OPTION=[VALUE] For example: servers:global:http-library=serf lej:a1 loewis$ lej:a1 loewis$ svn ls -r1 https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1 a.py lej:a1 loewis$ ls a.py b.py svn-commit.tmp lej:a1 loewis$ rm svn-commit.tmp lej:a1 loewis$ svn up At revision 9. lej:a1 loewis$ svn log a.py |less lej:a1 loewis$ vim a.py lej:a1 loewis$ svn a.py Unknown command: 'a.py' Type 'svn help' for usage. lej:a1 loewis$ svn commit a.py Sending a.py Transmitting file data . Committed revision 10. lej:a1 loewis$ svn up At revision 10. lej:a1 loewis$ lej:a1 loewis$ svn diff -r PREV Index: a.py =================================================================== --- a.py (revision 9) +++ a.py (working copy) @@ -1,6 +1,8 @@ def message(language): if language == 'German': + print "

" print "Hallo, Welt!" + print "

" else: print "Hello, world!" lej:a1 loewis$ svn diff -r PREV > bogus.diff lej:a1 loewis$ cat bogus.diff Index: a.py =================================================================== --- a.py (revision 9) +++ a.py (working copy) @@ -1,6 +1,8 @@ def message(language): if language == 'German': + print "

" print "Hallo, Welt!" + print "

" else: print "Hello, world!" lej:a1 loewis$ patch lej:a1 loewis$ man patch lej:a1 loewis$ patch -R < bogus.diff patching file a.py lej:a1 loewis$ svn status ? bogus.diff M a.py lej:a1 loewis$ rm bogus.diff lej:a1 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 10) +++ a.py (working copy) @@ -1,8 +1,6 @@ def message(language): if language == 'German': - print "

" print "Hallo, Welt!" - print "

" else: print "Hello, world!" lej:a1 loewis$ svn commit Sending a.py Transmitting file data . Committed revision 11. lej:a1 loewis$ svn status lej:a1 loewis$ ls -a . .. .svn a.py b.py lej:a1 loewis$ ls .svn/ all-wcprops prop-base text-base entries props tmp lej:a1 loewis$ less .svn/entries lej:a1 loewis$ less .svn/text-base/ .svn/text-base/ is a directory lej:a1 loewis$ ls .svn/text-base/ a.py.svn-base b.py.svn-base lej:a1 loewis$ vim b.py lej:a1 loewis$ svn diff Index: b.py =================================================================== --- b.py (revision 10) +++ b.py (working copy) @@ -1,4 +1,4 @@ import a -a.message('German') +a.message('Germany') print "Fertig" lej:a1 loewis$ svn revert b.py Reverted 'b.py' lej:a1 loewis$ svn cp --help copy (cp): Duplicate something in working copy or repository, remembering history. usage: copy SRC[@REV]... DST When copying multiple sources, they will be added as children of DST, which must be a directory. SRC and DST can each be either a working copy (WC) path or URL: WC -> WC: copy and schedule for addition (with history) WC -> URL: immediately commit a copy of WC to URL URL -> WC: check out URL into WC, schedule for addition URL -> URL: complete server-side copy; used to branch and tag All the SRCs must be of the same type. WARNING: For compatibility with previous versions of Subversion, copies performed using two working copy paths (WC -> WC) will not contact the repository. As such, they may not, by default, be able to propagate merge tracking information from the source of the copy to the destination. Valid options: -r [--revision] ARG : ARG (some commands also take ARG1:ARG2 range) A revision argument can be one of: NUMBER revision number '{' DATE '}' revision at start of the date 'HEAD' latest in repository 'BASE' base rev of item's working copy 'COMMITTED' last commit at or before BASE 'PREV' revision just before COMMITTED -q [--quiet] : print nothing, or only summary information --ignore-externals : ignore externals definitions --parents : make intermediate directories -m [--message] ARG : specify log message ARG -F [--file] ARG : read log message from file ARG --force-log : force validity of log message source --editor-cmd ARG : use ARG as external editor --encoding ARG : treat value as being in charset encoding ARG --with-revprop ARG : set revision property ARG in new revision using the name[=value] format Global options: --username ARG : specify a username ARG --password ARG : specify a password ARG --no-auth-cache : do not cache authentication tokens --non-interactive : do no interactive prompting --trust-server-cert : accept unknown SSL server certificates without prompting (but only with '--non-interactive') --config-dir ARG : read user configuration files from directory ARG --config-option ARG : set user configuration option in the format: FILE:SECTION:OPTION=[VALUE] For example: servers:global:http-library=serf lej:a1 loewis$ lej:a1 loewis$ svn info Path: . URL: https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1/a1 Repository Root: https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1 Repository UUID: d819e9f3-ea21-4e23-a02d-62e5390b38c1 Revision: 10 Node Kind: directory Schedule: normal Last Changed Author: Martin von Loewis Last Changed Rev: 10 Last Changed Date: 2010-01-05 09:25:54 +0100 (Di, 05 Jan 2010) lej:a1 loewis$ svn info b.py Path: b.py Name: b.py URL: https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1/a1/b.py Repository Root: https://www.dcl.hpi.uni-potsdam.de/pt1svn/group1 Repository UUID: d819e9f3-ea21-4e23-a02d-62e5390b38c1 Revision: 10 Node Kind: file Schedule: normal Last Changed Author: Martin von Loewis Last Changed Rev: 9 Last Changed Date: 2010-01-04 18:26:22 +0100 (Mo, 04 Jan 2010) Text Last Updated: 2010-01-05 09:40:43 +0100 (Di, 05 Jan 2010) Checksum: a65ae60b6e7076053c97f633f680b924 lej:a1 loewis$ svn up At revision 11. lej:a1 loewis$ cd ../a2/ lej:a2 loewis$ svn up U a.py U b.py Updated to revision 11. lej:a2 loewis$ cd ../a1 lej:a1 loewis$ ls a.py b.py lej:a1 loewis$ vim a1 lej:a1 loewis$ vim a1 lej:a1 loewis$ ls a.py b.py lej:a1 loewis$ vim a.py lej:a1 loewis$ vim b.py lej:a1 loewis$ cd ../a2/ lej:a2 loewis$ ls a.py a.pyc b.py lej:a2 loewis$ vim b.py lej:a2 loewis$ vim a.py lej:a2 loewis$ svn commit Sending a.py Sending b.py Transmitting file data .. Committed revision 12. lej:a2 loewis$ cd ../a1/ lej:a1 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 11) +++ a.py (working copy) @@ -1,5 +1,5 @@ def message(language): - if language == 'German': + if language == 'de': print "Hallo, Welt!" else: print "Hello, world!" Index: b.py =================================================================== --- b.py (revision 11) +++ b.py (working copy) @@ -1,4 +1,4 @@ import a -a.message('German') +a.message('de') print "Fertig" lej:a1 loewis$ svn commit Sending a.py svn: Commit failed (details follow): svn: File or directory 'a.py' is out of date; try updating svn: resource out of date; try updating svn: Your commit message was left in a temporary file: svn: '/Users/loewis/tmp/svndemo/a1/svn-commit.tmp' lej:a1 loewis$ svn up G a.py Conflict discovered in 'b.py'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C b.py Updated to revision 12. Summary of conflicts: Text conflicts: 1 lej:a1 loewis$ svn commit svn: Commit failed (details follow): svn: Aborting commit: '/Users/loewis/tmp/svndemo/a1/b.py' remains in conflict lej:a1 loewis$ ls a.py b.py.mine b.py.r12 b.py b.py.r11 svn-commit.tmp lej:a1 loewis$ vim b.py lej:a1 loewis$ vim a.py lej:a1 loewis$ svn diff|less lej:a1 loewis$ svn commit svn: Commit failed (details follow): svn: Aborting commit: '/Users/loewis/tmp/svndemo/a1/b.py' remains in conflict lej:a1 loewis$ svn resolved b.py Resolved conflicted state of 'b.py' lej:a1 loewis$ ls a.py b.py svn-commit.tmp lej:a1 loewis$ svn commit Sending a.py Sending b.py Transmitting file data .. Committed revision 13. lej:a1 loewis$ svn switch --help switch (sw): Update the working copy to a different URL. usage: 1. switch URL[@PEGREV] [PATH] 2. switch --relocate FROM TO [PATH...] 1. Update the working copy to mirror a new URL within the repository. This behavior is similar to 'svn update', and is the way to move a working copy to a branch or tag within the same repository. If specified, PEGREV determines in which revision the target is first looked up. If --force is used, unversioned obstructing paths in the working copy do not automatically cause a failure if the switch attempts to add the same path. If the obstructing path is the same type (file or directory) as the corresponding path in the repository it becomes versioned but its contents are left 'as-is' in the working copy. This means that an obstructing directory's unversioned children may also obstruct and become versioned. For files, any content differences between the obstruction and the repository are treated like a local modification to the working copy. All properties from the repository are applied to the obstructing path. Use the --set-depth option to set a new working copy depth on the targets of this operation. Currently, the depth of a working copy directory can only be increased (telescoped more deeply); you cannot make a directory more shallow. 2. Rewrite working copy URL metadata to reflect a syntactic change only. This is used when repository's root URL changes (such as a scheme or hostname change) but your working copy still reflects the same directory within the same repository. See also 'svn help update' for a list of possible characters reporting the action taken. Valid options: -r [--revision] ARG : ARG (some commands also take ARG1:ARG2 range) A revision argument can be one of: NUMBER revision number '{' DATE '}' revision at start of the date 'HEAD' latest in repository 'BASE' base rev of item's working copy 'COMMITTED' last commit at or before BASE 'PREV' revision just before COMMITTED -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates --depth ARG : limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity') --set-depth ARG : set new working copy depth to ARG ('exclude', 'empty', 'files', 'immediates', or 'infinity') -q [--quiet] : print nothing, or only summary information --diff3-cmd ARG : use ARG as merge command --relocate : relocate via URL-rewriting --ignore-externals : ignore externals definitions --force : force operation to run --accept ARG : specify automatic conflict resolution action ('postpone', 'base', 'mine-conflict', 'theirs-conflict', 'mine-full', 'theirs-full', 'edit', 'launch') Global options: --username ARG : specify a username ARG --password ARG : specify a password ARG --no-auth-cache : do not cache authentication tokens --non-interactive : do no interactive prompting --trust-server-cert : accept unknown SSL server certificates without prompting (but only with '--non-interactive') --config-dir ARG : read user configuration files from directory ARG --config-option ARG : set user configuration option in the format: FILE:SECTION:OPTION=[VALUE] For example: servers:global:http-library=serf lej:a1 loewis$ svn merge --help|less lej:a1 loewis$