Apache Subversion (SVN)

Transcription

1 Datamining und Sequenzanalyse Florian Rasche, Sascha Winter

2 Teamwork is the concept of people working together cooperatively (Wikipedia) e.g. writing a paper, software development... But how to manage this cooperative work in practice?

3 The Problem of File Sharing

4 The Lock-Modify-Unlock Solution Locking may cause administrative problems Locking may cause unnecessary serialization Locking may create a false sense of security

5 The Copy-Modify-Merge Solution

6 Basic Work Cycle 1 Checkout/Update your working copy svn checkout/update 2 Make changes svn add delete copy move 3 Examine your changes svn status diff 4 Possibly undo some changes svn revert 5 Merge others changes (and resolve conflicts) svn update resolve 6 Commit your changes svn commit

7 Subversion Repositories extern machine: login2.minet.uni-jena.de repositories: /data/bipr/biodmxx access by svn+ssh

8 Initial Checkout florian:home$ mkdir bipr florian:home$ cd bipr/ florian:bipr$ svn co svn+ssh://login2.minet.unijena.de/data/bipr/biodm11 s password: s password: A biodm11/test2.txt A biodm11/patternmatching A biodm11/test.txt Checked out revision 3. florian:bipr$ ls biodm11 florian:bipr$ cd biodm11/ florian:biodm11$ ls patternmatching test.txt test2.txt

9 Add Files/Directories florian:biodm11$ mkdir project1 florian:biodm11$ svn add project1 A project1 florian:biodm11$ svn ci -m project1 dir angelegt florian@login2.minet.uni-jena.de s password: Adding project1 Committed revision 4.

10 Remove Files/Directories florian:biodm11$ ls patternmatching project1 test.txt test2.txt florian:biodm11$ svn del test2.txt D test2.txt florian:biodm11$ svn ci -m removed test2 florian@login2.minet.uni-jena.de s password: Deleting test2.txt Committed revision 5. florian:biodm11$ ls patternmatching project1 test.txt

11 Update florian:biodm11$ svn update s password: U test.txt Updated to revision 6.

12 Commit florian:biodm11$ vim test.txt florian:biodm11$ svn ci -m noch ein update s password: Sending test.txt Transmitting file data. Committed revision 7.

13 Conflict florian:biodm11$ svn update s password: C test.txt Updated to revision 8. florian:biodm11$ ls patternmatching test.txt test.txt.r7 project1 test.txt.mine test.txt.r8 florian:biodm11$ cat test.txt <<<<<<.mine konf likt ======= konflikt! >>>>>>.r8 Noch ein update!

14 Resolve Conflicts florian:biodm11$ vim test.txt florian:biodm11$ cat test.txt konflikt! Noch ein update! florian:biodm11$ svn resolved test.txt Resolved conflicted state of test.txt florian:biodm11$ svn ci -m kein konflikt florian:biodm11$ ls patternmatching project1 test.txt

15 Source Repository Rules 1 There shalt not be binary files in the repository Binary files (executables, native libraries, zip files, far files, etc.) are NOT source You might want to have a central repository for libraries Keep your repository at least compilable

16 Source Repository Rules 1 There shalt not be binary files in the repository Binary files (executables, native libraries, zip files, far files, etc.) are NOT source You might want to have a central repository for libraries Keep your repository at least compilable 2 Keep thy path names simple No special characters in path names (blanks, non-printing characters, special character like $ or % )

17 Source Repository Rules 1 There shalt not be binary files in the repository Binary files (executables, native libraries, zip files, far files, etc.) are NOT source You might want to have a central repository for libraries Keep your repository at least compilable 2 Keep thy path names simple No special characters in path names (blanks, non-printing characters, special character like $ or % ) 3 Generated source files shall not be added as managed files Files generated during the build are not part of the managed repository

18 Source Repository Rules 1 There shalt not be binary files in the repository Binary files (executables, native libraries, zip files, far files, etc.) are NOT source You might want to have a central repository for libraries Keep your repository at least compilable 2 Keep thy path names simple No special characters in path names (blanks, non-printing characters, special character like $ or % ) 3 Generated source files shall not be added as managed files Files generated during the build are not part of the managed repository 4 All output from the build shall be kept separated from the source Use a well defined output directory (build/ or dist/ or target/) Never write to your src/ directory during the build process The output directory is NOT part of the managed repository Kelly O Hair: repository rules