Administrators-Computer:~ loewis$ cd demo/ Administrators-Computer:demo loewis$ ls Administrators-Computer:demo loewis$ mkdir p1 Administrators-Computer:demo loewis$ cd p1/ Administrators-Computer:p1 loewis$ vim a.py Administrators-Computer:p1 loewis$ cd .. Administrators-Computer:demo loewis$ cd p1/ Administrators-Computer:p1 loewis$ svn import https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 . svn: Try 'svn help' for more info svn: Invalid URL '' Administrators-Computer:p1 loewis$ svn import https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 . Administrators-Computer:p1 loewis$ svn --version svn, version 1.5.4 (r33841) compiled Oct 27 2008, 11:19:10 Copyright (C) 2000-2008 CollabNet. Subversion is open source software, see http://subversion.tigris.org/ This product includes software developed by CollabNet (http://www.Collab.Net/). The following repository access (RA) modules are available: * ra_neon : Module for accessing a repository via WebDAV protocol using Neon. - handles 'http' scheme - handles 'https' scheme * ra_svn : Module for accessing a repository using the svn network protocol. - with Cyrus SASL authentication - handles 'svn' scheme * ra_local : Module for accessing a repository on local disk. - handles 'file' scheme * ra_serf : Module for accessing a repository via WebDAV protocol using serf. - handles 'http' scheme - handles 'https' scheme Administrators-Computer:p1 loewis$ svn import https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 Administrators-Computer:p1 loewis$ svn ls https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/ Passphrase for '/Users/loewis/.subversion/hpi.p12': Administrators-Computer:p1 loewis$ svn import https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 . svn: Try 'svn help' for more info svn: Invalid URL '' Administrators-Computer:p1 loewis$ svn import https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 Administrators-Computer:p1 loewis$ svn help import 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 --config-dir ARG : read user configuration files from directory ARG Administrators-Computer:p1 loewis$ svn import . https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 Passphrase for '/Users/loewis/.subversion/hpi.p12': Adding a.py Committed revision 1. Administrators-Computer:p1 loewis$ cd .. Administrators-Computer:demo loewis$ ls p1 Administrators-Computer:demo loewis$ rm -rf p1/ Administrators-Computer:demo loewis$ svn co https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 Passphrase for '/Users/loewis/.subversion/hpi.p12': A p1/a.py Checked out revision 1. Administrators-Computer:demo loewis$ ls p1 Administrators-Computer:demo loewis$ cd p1/ Administrators-Computer:p1 loewis$ ls a.py Administrators-Computer:p1 loewis$ svn info . Path: . URL: https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 Repository Root: https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3 Repository UUID: 8ba13fcc-e69b-4347-86a9-7fce874d5f07 Revision: 1 Node Kind: directory Schedule: normal Last Changed Author: Martin vonLoewis Last Changed Rev: 1 Last Changed Date: 2008-12-18 14:13:35 +0100 (Do, 18 Dez 2008) Administrators-Computer:p1 loewis$ ls -a . .. .svn a.py Administrators-Computer:p1 loewis$ ls -l .svn/ total 24 -r--r--r-- 1 loewis admin 146 18 Dez 14:14 all-wcprops -r--r--r-- 1 loewis admin 399 18 Dez 14:14 entries -r--r--r-- 1 loewis admin 2 18 Dez 14:14 format drwxr-xr-x 2 loewis admin 68 18 Dez 14:14 prop-base drwxr-xr-x 2 loewis admin 68 18 Dez 14:14 props drwxr-xr-x 3 loewis admin 102 18 Dez 14:14 text-base drwxr-xr-x 5 loewis admin 170 18 Dez 14:14 tmp Administrators-Computer:p1 loewis$ more .svn/entries 9 dir 1 https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3 2008-12-18T13:13:35.600242Z 1 Martin vonLoewis svn:special svn:externals svn:needs-lock Administrators-Computer:p1 loewis$ svn co https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 Administrators-Computer:p1 loewis$ svn help usage: svn [options] [args] Subversion command-line client, version 1.5.4. 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/ Administrators-Computer:p1 loewis$ Administrators-Computer:p1 loewis$ ls a.py Administrators-Computer:p1 loewis$ vim a.py Administrators-Computer:p1 loewis$ svn ci Passphrase for '/Users/loewis/.subversion/hpi.p12': Sending a.py Transmitting file data . Committed revision 2. Administrators-Computer:p1 loewis$ vim a.py Administrators-Computer:p1 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 2) +++ a.py (working copy) @@ -1,3 +1,4 @@ print "Hallo, Welt" +print "Noch mehr Text" +print "Mehr Text" -print "Mehr Text" Administrators-Computer:p1 loewis$ svn revert a.py Reverted 'a.py' Administrators-Computer:p1 loewis$ vim a.py Administrators-Computer:p1 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 2) +++ a.py (working copy) @@ -1,3 +1,3 @@ print "Hallo, Welt" - +print "Noch mehr Text" print "Mehr Text" Administrators-Computer:p1 loewis$ svn log a.py Passphrase for '/Users/loewis/.subversion/hpi.p12': ------------------------------------------------------------------------ r2 | Martin vonLoewis | 2008-12-18 14:17:34 +0100 (Do, 18 Dez 2008) | 2 lines Print more text. ------------------------------------------------------------------------ r1 | Martin vonLoewis | 2008-12-18 14:13:35 +0100 (Do, 18 Dez 2008) | 2 lines Initial import of demo project for pt1 lecture. ------------------------------------------------------------------------ Administrators-Computer:p1 loewis$ svn ci Passphrase for '/Users/loewis/.subversion/hpi.p12': Sending a.py Transmitting file data . Committed revision 3. Administrators-Computer:p1 loewis$ svn ann a.py Passphrase for '/Users/loewis/.subversion/hpi.p12': 1 Martin vonLoewis print "Hallo, Welt" 3 Martin vonLoewis print "Noch mehr Text" 2 Martin vonLoewis print "Mehr Text" Administrators-Computer:p1 loewis$ svn help usage: svn [options] [args] Subversion command-line client, version 1.5.4. 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/ Administrators-Computer:p1 loewis$ Administrators-Computer:p1 loewis$ cd .. Administrators-Computer:demo loewis$ svn co https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 p2 Passphrase for '/Users/loewis/.subversion/hpi.p12': A p2/a.py Checked out revision 3. Administrators-Computer:demo loewis$ cd p2/ Administrators-Computer:p2 loewis$ ls a.py Administrators-Computer:p2 loewis$ touch b.py Administrators-Computer:p2 loewis$ svn add Administrators-Computer:p2 loewis$ svn info Path: . URL: https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1 Repository Root: https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3 Repository UUID: 8ba13fcc-e69b-4347-86a9-7fce874d5f07 Revision: 3 Node Kind: directory Schedule: normal Last Changed Author: Martin vonLoewis Last Changed Rev: 3 Last Changed Date: 2008-12-18 14:22:08 +0100 (Do, 18 Dez 2008) Administrators-Computer:p2 loewis$ svn status ? b.py Administrators-Computer:p2 loewis$ svn add b.py A b.py Administrators-Computer:p2 loewis$ svn status A b.py Administrators-Computer:p2 loewis$ vim a.py Administrators-Computer:p2 loewis$ svn status M a.py A b.py Administrators-Computer:p2 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Sending a.py Adding b.py Transmitting file data .. Committed revision 4. Administrators-Computer:p2 loewis$ ls a.py b.py Administrators-Computer:p2 loewis$ cd ../p1/ Administrators-Computer:p1 loewis$ ls a.py Administrators-Computer:p1 loewis$ svn up Passphrase for '/Users/loewis/.subversion/hpi.p12': U a.py A b.py Updated to revision 4. Administrators-Computer:p1 loewis$ vim a.py Administrators-Computer:p1 loewis$ cd ../p2/ Administrators-Computer:p2 loewis$ vim a.py Administrators-Computer:p2 loewis$ svn status M a.py Administrators-Computer:p2 loewis$ svn commit Administrators-Computer:p2 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 4) +++ a.py (working copy) @@ -1,3 +1,5 @@ +def bar(): + return 107 print "Hello, World" print "Noch mehr Text" print "Mehr Text" Administrators-Computer:p2 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Sending a.py Transmitting file data . Committed revision 5. Administrators-Computer:p2 loewis$ cd ../p1/ Administrators-Computer:p1 loewis$ svn commit Log message unchanged or not specified (a)bort, (c)ontinue, (e)dit : a Administrators-Computer:p1 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 4) +++ a.py (working copy) @@ -1,3 +1,6 @@ print "Hello, World" print "Noch mehr Text" print "Mehr Text" + +def foo(n): + return 3*n Administrators-Computer:p1 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Sending a.py svn: Commit failed (details follow): svn: File or directory 'a.py' is out of date; try updating svn: The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit). svn: Your commit message was left in a temporary file: svn: '/Users/loewis/demo/p1/svn-commit.tmp' Administrators-Computer:p1 loewis$ svn info a.py Path: a.py Name: a.py URL: https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1/a.py Repository Root: https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3 Repository UUID: 8ba13fcc-e69b-4347-86a9-7fce874d5f07 Revision: 4 Node Kind: file Schedule: normal Last Changed Author: Martin vonLoewis Last Changed Rev: 4 Last Changed Date: 2008-12-18 14:26:04 +0100 (Do, 18 Dez 2008) Text Last Updated: 2008-12-18 14:26:30 +0100 (Do, 18 Dez 2008) Checksum: 85d13f66b00f3259cf55b109fa3d3e92 Administrators-Computer:p1 loewis$ svn up Passphrase for '/Users/loewis/.subversion/hpi.p12': G a.py Updated to revision 5. Administrators-Computer:p1 loewis$ vim a.py Administrators-Computer:p1 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 5) +++ a.py (working copy) @@ -3,3 +3,6 @@ print "Hello, World" print "Noch mehr Text" print "Mehr Text" + +def foo(n): + return 3*n Administrators-Computer:p1 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Sending a.py Transmitting file data . Committed revision 6. Administrators-Computer:p1 loewis$ svn blame a.py Passphrase for '/Users/loewis/.subversion/hpi.p12': 5 Martin vonLoewis def bar(): 5 Martin vonLoewis return 107 4 Martin vonLoewis print "Hello, World" 3 Martin vonLoewis print "Noch mehr Text" 2 Martin vonLoewis print "Mehr Text" 6 Martin vonLoewis 6 Martin vonLoewis def foo(n): 6 Martin vonLoewis return 3*n Administrators-Computer:p1 loewis$ vim p1 Administrators-Computer:p1 loewis$ vim a.py Administrators-Computer:p1 loewis$ cd ../p2/ Administrators-Computer:p2 loewis$ vim a.py Administrators-Computer:p2 loewis$ cd ../p1/ Administrators-Computer:p1 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Sending a.py Transmitting file data . Committed revision 7. Administrators-Computer:p1 loewis$ cd ../p2/ Administrators-Computer:p2 loewis$ svn up Passphrase for '/Users/loewis/.subversion/hpi.p12': Conflict discovered in 'a.py'. Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: h (p) postpone - mark the conflict to be resolved later (df) diff-full - show all changes made to merged file (e) edit - change merged file in an editor (r) resolved - accept merged version of file (mf) mine-full - accept my version of entire file (ignore their changes) (tf) theirs-full - accept their version of entire file (lose my changes) (l) launch - launch external tool to resolve conflict (h) help - show this list Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: p C a.py Updated to revision 7. Administrators-Computer:p2 loewis$ svn status ? a.py.r5 ? a.py.mine ? a.py.r7 C a.py Administrators-Computer:p2 loewis$ ls a.py a.py.mine a.py.r5 a.py.r7 b.py Administrators-Computer:p2 loewis$ vim a.py Administrators-Computer:p2 loewis$ svn status ? a.py.r5 ? a.py.mine ? a.py.r7 C a.py Administrators-Computer:p2 loewis$ svn resolved a.py Resolved conflicted state of 'a.py' Administrators-Computer:p2 loewis$ ls a.py b.py Administrators-Computer:p2 loewis$ svn diff Index: a.py =================================================================== --- a.py (revision 7) +++ a.py (working copy) @@ -1,5 +1,5 @@ def bar(): - return 701 + return 55 print "Hello, World" print "Noch mehr Text" print "Mehr Text" Administrators-Computer:p2 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Sending a.py Transmitting file data . Committed revision 8. Administrators-Computer:p2 loewis$ ls a.py b.py Administrators-Computer:p2 loewis$ svn cp a.py c.py A c.py Administrators-Computer:p2 loewis$ ls a.py b.py c.py Administrators-Computer:p2 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Adding c.py Committed revision 9. Administrators-Computer:p2 loewis$ svn log c.py Passphrase for '/Users/loewis/.subversion/hpi.p12': ------------------------------------------------------------------------ r9 | Martin vonLoewis | 2008-12-18 14:40:46 +0100 (Do, 18 Dez 2008) | 2 lines Copy a into c. ------------------------------------------------------------------------ r8 | Martin vonLoewis | 2008-12-18 14:39:40 +0100 (Do, 18 Dez 2008) | 2 lines Correct return value. ------------------------------------------------------------------------ r7 | Martin vonLoewis | 2008-12-18 14:34:47 +0100 (Do, 18 Dez 2008) | 2 lines Change return value ------------------------------------------------------------------------ r6 | Martin vonLoewis | 2008-12-18 14:32:47 +0100 (Do, 18 Dez 2008) | 2 lines Add function foo. ------------------------------------------------------------------------ r5 | Martin vonLoewis | 2008-12-18 14:28:49 +0100 (Do, 18 Dez 2008) | 2 lines Add function bar. ------------------------------------------------------------------------ r4 | Martin vonLoewis | 2008-12-18 14:26:04 +0100 (Do, 18 Dez 2008) | 3 lines Change message to english, add new file. ------------------------------------------------------------------------ r3 | Martin vonLoewis | 2008-12-18 14:22:08 +0100 (Do, 18 Dez 2008) | 2 lines Noch mehr text. ------------------------------------------------------------------------ r2 | Martin vonLoewis | 2008-12-18 14:17:34 +0100 (Do, 18 Dez 2008) | 2 lines Print more text. ------------------------------------------------------------------------ r1 | Martin vonLoewis | 2008-12-18 14:13:35 +0100 (Do, 18 Dez 2008) | 2 lines Initial import of demo project for pt1 lecture. ------------------------------------------------------------------------ Administrators-Computer:p2 loewis$ Administrators-Computer:p2 loewis$ svn log -v c.py Passphrase for '/Users/loewis/.subversion/hpi.p12': ------------------------------------------------------------------------ r9 | Martin vonLoewis | 2008-12-18 14:40:46 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: A /p1/c.py (from /p1/a.py:8) Copy a into c. ------------------------------------------------------------------------ r8 | Martin vonLoewis | 2008-12-18 14:39:40 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: M /p1/a.py Correct return value. ------------------------------------------------------------------------ r7 | Martin vonLoewis | 2008-12-18 14:34:47 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: M /p1/a.py Change return value ------------------------------------------------------------------------ r6 | Martin vonLoewis | 2008-12-18 14:32:47 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: M /p1/a.py Add function foo. ------------------------------------------------------------------------ r5 | Martin vonLoewis | 2008-12-18 14:28:49 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: M /p1/a.py Add function bar. ------------------------------------------------------------------------ r4 | Martin vonLoewis | 2008-12-18 14:26:04 +0100 (Do, 18 Dez 2008) | 3 lines Changed paths: M /p1/a.py A /p1/b.py Change message to english, add new file. ------------------------------------------------------------------------ r3 | Martin vonLoewis | 2008-12-18 14:22:08 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: M /p1/a.py Noch mehr text. ------------------------------------------------------------------------ r2 | Martin vonLoewis | 2008-12-18 14:17:34 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: M /p1/a.py Print more text. ------------------------------------------------------------------------ r1 | Martin vonLoewis | 2008-12-18 14:13:35 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: A /p1 A /p1/a.py Initial import of demo project for pt1 lecture. ------------------------------------------------------------------------ Administrators-Computer:p2 loewis$ Administrators-Computer:p2 loewis$ ls a.py b.py c.py Administrators-Computer:p2 loewis$ svn mv b.py b2.py A b2.py D b.py Administrators-Computer:p2 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Passphrase for '/Users/loewis/.subversion/hpi.p12': Passphrase for '/Users/loewis/.subversion/hpi.p12': svn: Commit failed (details follow): svn: Server sent unexpected return value (403 Forbidden) in response to OPTIONS request for 'https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1' svn: Your commit message was left in a temporary file: svn: '/Users/loewis/demo/p2/svn-commit.tmp' Administrators-Computer:p2 loewis$ svn mv b.py b2.py svn: Path 'b.py' does not exist Administrators-Computer:p2 loewis$ svn commit Passphrase for '/Users/loewis/.subversion/hpi.p12': Deleting b.py Adding b2.py Committed revision 10. Administrators-Computer:p2 loewis$ svn log b2.py Passphrase for '/Users/loewis/.subversion/hpi.p12': Passphrase for '/Users/loewis/.subversion/hpi.p12': Passphrase for '/Users/loewis/.subversion/hpi.p12': svn: Server sent unexpected return value (403 Forbidden) in response to OPTIONS request for 'https://www.dcl.hpi.uni-potsdam.de/pt1svn/user3/p1/b2.py' Administrators-Computer:p2 loewis$ svn log -v b2.py Passphrase for '/Users/loewis/.subversion/hpi.p12': ------------------------------------------------------------------------ r10 | Martin vonLoewis | 2008-12-18 14:43:12 +0100 (Do, 18 Dez 2008) | 2 lines Changed paths: D /p1/b.py A /p1/b2.py (from /p1/b.py:7) Rename b. ------------------------------------------------------------------------ r4 | Martin vonLoewis | 2008-12-18 14:26:04 +0100 (Do, 18 Dez 2008) | 3 lines Changed paths: M /p1/a.py A /p1/b.py Change message to english, add new file. ------------------------------------------------------------------------ Administrators-Computer:p2 loewis$ ls .svn/ all-wcprops format props/ tmp/ entries prop-base/ text-base/ Administrators-Computer:p2 loewis$ ls .svn/text-base/ a.py.svn-base b2.py.svn-base c.py.svn-base Administrators-Computer:p2 loewis$