About cookies

3 Item(s)

per page

Set Ascending Direction
  • Pomodoro - 敏捷时间管理

    9 year(s) ago

    长话短说,我们主要介绍下Pomodoro的学习资料:
    
    书: 45-page book
    
    Cheat Sheet: one-page cheat sheet
    
    网站: The Pomodoro Technique website.
    
    A personal time management approach known as The Pomodoro Technique is becoming quite popular with agile practitioners. Pomodoro includes a number of practices similar to those used by an agile team: time-boxing, frequent opportunities to inspect-and-adapt, estimation, a preference for low-tech tools, and an emphasis on maintaining a sustainable pace.
    
    Francesco Cirillo began developing the technique in the 80's, while he was a student. He was looking for a way to improve the quality of his study time and cut down on the distractions and interruptions that kept him from focusing.
    
    So I made a bet with myself, as helpful as it was humiliating: “Can you study – really study - for 10 minutes?” I needed objective validation, a Time Tutor, and I found one in a kitchen timer shaped like a pomodoro (the Italian for tomato).
    Over the next few years the technique evolved until about 1992, when it took the basic form that it still holds today. In Pomodoro, work is accomplished in uninterrupted 25-minute sessions called Pomodoros. At the end of each Pomodoro, there is a short break. After every set of 3 or 4 Pomodoros, there is a longer break. The technique includes some lightweight planning and tracking as well. At the beginning of the day, a list of the day's objectives is created and then estimated in terms of how many Pomodoros it will take to accomplish. Tasks that will take more than seven Pomodoros should be broken down. Tasks that will take less than one Pomodoro should be grouped together until there is a full Pomodoro's worth. Interruptions and distractions are dealt with by quickly recording them in a way that they can be handled after the current Pomodoro is over. On the rare occasions when an interruption can't be handled in this manner, the current Pomodoro is stopped and considered void. As Francesco says, the next Pomodoro will go better. Over the last couple of years, the Pomodoro Technique has caught the attention of the agile community. Staffan Noteberg's session on the technique was so popular at Agile2008 that it was selected to be re-run at the end of the conference. At Agile2009 Staffan again presented on the technique, as did Renzo Borgatti with a session called: You say tomato, I say Pomodoro.

  • CI 持续集成与GIT分布式开发

    9 year(s) ago

    CI持续集成在敏捷开发有巨大意义。
    
    通过实施CI持续集成,我们可以保证客户的反馈尽早获得,与客户进行“现场”需求分析。
    
    但是由于传统版本控制工具在多人提交时候会出现效率下降,因此持续集成(也即快速反馈需求)的一个关键实现目标就是有一个快速高效的版本控制工具,在这点上git要比svn有优势。
    
    首先他是一个离线式的版本控制工具,本地和服务器都可以进行提交。那么在关键性的地方我们可以进行提交,集成确认问题。
    
    在实际项目实施过程中。我们发现:
    
    hudson作为持续工具很好很强大,针对其接口进行二次扩展可以很方便的完善系统的开发和应用。 不仅仅体现在版本控制,发布管理,还可以实现项目自动生成,变更。
    
    通过api远程获得数据,组装对应的产成品也不是问题。(当然这个脱离了其初衷了)
    

  • svn的操作简介

    8 year(s) ago

    以下文字写的很完整,很详实。供开发者学习。管理维护人员借鉴。
    
    
    
    Subversion Introduction:
    Subversion is a software source code "Change Management" (CM) system for collaborative development. It maintains a history of file and directory versions. The files and directories are checked out of the repository and into your local project work area. This called your "working directory". Changes are made to files in your "working directory". After changes are made to the create the next working version, the files are checked into the Subversion CM repository.
    Subversion Commands:
    Subversion command summary cheat sheet:
    Command Description
    svn --help List Subversion commands
    svn help command Also: ? or h Help on given "command"
    svn add filenamesvn add directory Add a file or directory to Subversion CM control. Must also perform: svn ci filename (or svn commit) to upload the file or directory. File will not be available in the repository until a "commit" is performed. If adding a directory, the directory and all of its contents recursively are added. i.e.: svn ci directory svn commit directory svn commit .
    svn blame filename svn blame -r RevisionNumber filename Also: praise, annotate, ann Show file contents with revisions annotated with author information.
    svn cat filename List contents of file under Subversion control.
    svn checkout http://node-name/repos/svn/trunk/parentPath/path This creates: path/file1 path/file2 ...svn checkout http://node-name/repos/svn/trunk/parentPath . This creates: path/file1 path/file2 ... Note the difference a "." makes. svn checkout file:///repos/svn/trunk/path/ svn co -r 497 http://node-name/repos/svn/trunk/path file-name Also: svn co https://..., svn://..., and svn+ssh:// MS/Windows: svn co file:///c:/repository/project/trunk Checkout every file from the path and subdirectories specified below. Creates "working" copy of files and directories. Checkout a repository.Use option "-r" to specify a specific revision other than the latest. The URL "svn://" communicates with an SVN server (port 3690) The URL "http://" comunicates with the Apache server and modulemod_dav_svn (port 80) [more common server]
    svn cleanup Cleanup subversion files resulting from escaped processes and crashed.
    svn commit filename svn commit --message "Message goes here." filename svn commit -m "Message goes here." filename svn ci filename1 filename2 filename3 svn ci . Check-in (commit) local "working" file, files or directory and contents (recursively) into Subversion repository. Atomic, i.e. all committed or none, no incomplete check-in.
    svn copy source destination_clone Also: svn cp ... Copy file or directory tree. One can copy from one local working copy to another or to repository server URL's. The sources and destinations can be working copies or URLs.
    svn copy http://host/repos/project/trunk http://host/repos/project/tags/TagName-1.4.5 -m "Tag Release 1.4.5" Tag a release. Takes a snapshot of the repository and assigns a name. This can be performed at any directory branch.
    svn copy . http://host/repos/project/tags/TagName-1.4.5 -m "Tag Release 1.4.5" Tag a release. Takes a snapshot of your local working copy and assigns a name. This can be performed at any directory branch.
    svn delete filename svn delete directory Also: del, remove or rm svn rm http://host/repos/project/trunk/file-or-directory Delete file from repository. The UNIX command rm file-name. Must perform a "commit" to update the repository and local working directory with the changes. i.e.: svn commit .
    svn diff filename svn di filename Show file diffs between SVN repository and your file changes using GNU file diff format. Use GUI diff tools as shown below.
    svn diff -r rev1:rev2 filename Show file diffs between specified versions. Example: svn diff -r 456:459 subfn.cpp Using GUI diff tool: svn diff -r 457:459 --diff-cmd kdiff3 file-name
    svn diff filename > patch-file Generate patch file used by the patch command.
    svn export directory Export directory tree to your file system but it will not be a "working directory" under SVN control.
    svn export -r Rev-Number http://node-name/path Export directory tree of specified version and create local directory tree and files not under SVN control.
    svn import local-directory http://node/repos/svn/trunk/directory Add directory (and files in it recursively) to path in repository specified.
    svn info filename Display information about file or directory. (Date modified, author, revision, path in repository.) Can not specify a URL.
    svn list directory svn list file-name List file or directory of files in repository. Used to browse repository before checkout. If current directory is given (svn list ./), then Subversion will list the repository URL of the current directory.
    svn list -r RevisionNumber directory List directory of files in repository in specified revision.
    svn lock filename -m "comment as to why its locked or by whom" (Comment is not required but is often useful) Lock file to grant exclusive access to one and forbid all others. A commit will unlock the file (unless the "--no-unlock" option is used). A lock can be removed with the commands: svn unlock filename, svnlook and the svnadmincomands (i.e. List: svnadmin lslocks and remove: svnadmin rmlocks filename).
    svn log filename svn log . svn log http://URL/path/file svn log -v . svn log -r RevisionNumber http://URL/path/file Show the Subversion log messages for a set of revision(s) and/or file(s) and/or all directory contents in repository. List verbose. Includes list of all files in change Shows the file changes associated with revision number.
    svn merge http://url/path/branch1 http://url/path/branch2 working-local-dir svn merge file1@revJ file2@revK svn merge -r 414:411 http://url/path working-dir svn merge -r 413:HEAD file-name Merge directory changes into your current working directory or merge a file in Subversion into the file in your working directory. If target is not specified, the identical basename or current directory is assumed. Used to incorporate changes checked in which are not accounted for in your file or to merge branches. Example using GUI merge tool: svn diff -r 459:454 --diff-cmd kdiff3 --extensions '-m' file-name Next, tell subversion that the conflicts have been resolved: svn resolve file-name Finally, check-in file: svn ci file-name or abort changes: svn revert file-name
    svn merge --dry-run -r 414:413 http://url/path Test merge. No changes are made to your local working copy but shows Subversion feedback as if merge was performed.
    svn merge -r 414:413 http://url/path svn merge -r 414:413 . Undo changes committed in revision 414.
    svn mkdir directory svn mkdir http://URL/directory Create a new directory under version control.
    svn move directory1 directory2 svn mv directory1 directory2 svn mv file-old-name file-new-name Rename or move a file or directory. Moves/renames file/directory in repository and in local work area. Must perform svn ci file-new-name after the move for changes to to take place in repository.
    svn revert filename Undo changes in local work files. Throw away local changes.
    svn resolved filename Run this command after resolving merge conflicts. Next "commit" your changes.
    svn status svn status -u svn status -u . svn status -uq . Show status of file changes in current directory and recursively in directories below. Show out of date file info: svn status --show-updates (equivalent: svn status -u) -u: Determines status by comparing your local repository with the server repository. Without this option, the status shown will only be the changes you have made in your local repository.-q: Quiet. Do not print "?: File/directory not under version control" or "!: File/directory missing" extraneous information. First collumn:
    • A: File to be added
    • C: Conflicting changes
    • D: File to be deleted
    • G: File to be merged with updates from server
    • M: File has been modified
    • R: File to be replaced
    • G: File to be merged
    • X: Resource is external to repository (svn:externals)
    • ?: File/directory not under version control
    • !: File/directory missing
    • ~: Versioned item obstructed by some item of a different kind.
    Second collumn: Modification of properties
    • ' ' no modifications. Working copy is up to date.
    • 'C' Conflicted
    • 'M' Modified
    • '*' Local file different than repository. A newer revision exists on the server. Update will result in merge or possible conflict.
      • ' ' not locked
      • 'L' locked
      • 'S' switched to a branch
    • Third collumn: Locks
    svn switch http://server/new-branch svn switch --relocate http://server/old-path http://server/new-path Switch your local working copy to mirror a new repository branch instead of main trunk or previous branch. Also allows you to point your repository to a new path on the server if the server path changes since you performed a check-out.
    svn update svn update filename svn update -r458 filename svn update --ignore-externals ./ Migrate all updates from Subversion repository to your local copy (recusively for all files in the current directory and all below it). If there have been updates to the svn repository since you downloaded the files, subversion will give you the opportunity to merge. Status of files will use the coding as stated above for "status". Files marked with a "C" (conflict) should be merged of reverted. If merged then one can perform a "resolve" and then a "check-in". If a file name is specified, only that file is updated. Can also syncronize to a specified revision given by -r. Use --ignore-externals to avoid the slow processing of externals to a potentially slow distant internet server.
    Where RevisionNumber is:
    • HEAD: The latest revision in the repository.
    • BASE: The "pristine" revision of an item in a working copy. Matches checked out version before any modifications.
    • COMMITTED: The last revision in which an item changed before (or at) BASE.
    • PREV: The revision just before the last revision in which an item changed. (Technically, COMMITTED - 1.)

    Example Session:

    (Assumes that the repository has already been created. For Subversion repository creation and Subversion server configuration, see the (YoLinux Subversion and Trac tutorial )
    • Checkout: svn checkout http://svnserver/repos/svn/trunk/Project1
    • Go to source code directory: cd Project1/src
    • Edit files:
      • vi file1.cpp
      • vi file2.cpp
    • Verify and test: make We are ready to check-in the files into the Subversion repository.
    • Check repository and report on new revisions and changes others have checked in: svn status -u .
    • After many long hours or days of editing and work, get updates others have made: svn update
          U file.h
          C file1.cpp
          G file2.cpp
          ? a.out
      You will see:
      • U: File was updated with a newer version checked-in since your checkout.
      • G: Automatically merged with no conflicts.
      • C: Not merged due to conflicts. You made changes to the same section of code as the update made by someone else since your checkout.
    • For each "conflicted" file there will be three new local files generated by "update":
      • file1.cpp.mine (File - post editing)
      • file1.cpp.rold (BASE - pre editing)
      • file1.cpp.rnew (HEAD - Updated file from repository)
      The file file1.cpp still exists but with svn conflict marker strings added in the file. At this point, a check-in will fail until the merge is resolved.
    • Merge options:
      • Edit the file file1.cpp Text markers are placed in the file to show the conflicts between the "HEAD" and "mine" versions. OR
      • tkdiff -conflict file1.cpp OR
      • Use a GUI merge tool: kdiff3 file1.cpp.mine file1.cpp.rnew -o file1.cpp OR
      • Throw out your changes/abort: svn revert file1.cpp No resolve or check-in necessary if file is reverted.
    • Verify and test, again: make
    • Notify Subversion that conflicts have been resolved: svn resolved file1.cpp Note: This also removes the temporary files ".mine" and ".r###".
    • Check-in to Subversion repository: svn ci -m "Add comments here" file1.cpp

    Subversion Peg revisions:
    Peg revisions are used so Subversion can find a previous version of a resource (file or directory) if its' location was different than it is now. Peg revisions are that extra hint Subversion needs to clear up ambiguity. $ svn command -r OPERATIVE-REV item@PEG-REV The default peg revision is BASE for working copy items and HEAD for repository URLs. When no operative revision is provided, it defaults to being the same revision as the peg revision. The PEG-REV is specified if the resource (file/directory) in question use to appear in a directory which is no longer in the same place or no longer exists. The "peg-revision" must be specified so subversion can look at the directory in that revision so it can find the resource. If a peg revision is specified without an operative revision, then the operative revision is assumed to be the same as the peg revision. For more see: http://svnbook.red-bean.com/en/1.5/svn.advanced.pegrevs.html
    Subversion Properties:
    Files under revision control can include Subversion keywords which properties can be set with the "propset" command. Keywords are substituted with the Subversion properties and will not appear in the file until a commit is performed. Other properties are used to modify the behavior of Subversion. The following properties can be set on entities stored in Subversion:
    Property Description
    svn:ignore A newline separated list of file patterns to ignore. List of files/directories to be ignored by svn status
    svn:keywords Valid RCS style keywords are:
    • HeadURL - The URL for the head version of the object. Also: $URL$
    • LastChangedBy - The last person to modify the file. Also: $Author$
    • LastChangedDate - The date/time the object was last modified. Will appear as: $LastChangedDate: 2005-07-22 22:02:37 -0700 (Fri, 22 Jul 2005) $ Also: $Date$
    • LastChangedRevision - Describes the last known revision. Will appear as: $LastChangedRevision: XXX $ where "XXX" is the revision number. Also: $Rev$, Revision
    • $Id$ - A compressed summary of the previous 4 keywords.
    Example RCS style comment Example Output
    /* $URL$
       $Rev$
       $Author$
       $Date$
       $Id$
     */
    
    /* $URL:http://server/svn/path/file.cpp $
       $ Rev:2 $
       $ Author:Greg $
       $ Date:2006-10-12 14:31:84 -0400 (Thu,12 Oct 2006)$
       $ Id:file.cpp 3 2006-10-12 18:31:84Z Greg $
     */
    
    svn:executable Ensure file attribute is executable. Possible values: ON, OFF Example: svn propset svn:executable ON app.exe
    svn:eol-style One of 'native', 'LF', 'CR', 'CRLF'. Specify and maintain specified line ending for text file.
    • LF: Unix, Linux, standards based OS, proprietary legacy systems, etc.
    • CRLF: DOS and Microsoft OSs
    • CR: Response input scripts, etc
    Example: find ./ -name "*.h" -exec svn propset svn:eol-style LF {} \;
    svn:mime-type The mime type of the file:
    • text/html
    • text/css
    • text/plain
    • image/jpeg
    • ...
    See file /etc/mime.types for a list of mime types.Examples:
    • svn propset svn:mime-type text/plain file.cpp
    • svn propset svn:mime-type text/html file.html Web pages rendered from subversion will display as HTML source rather than as a web page unless this mime type is applied.
    svn:needs-lock Prevents conflicts for files which can not be contextually merged. i.e. photos, binaries, object libraries.
    svn:externals List of files or directories pointed to. Locate repository where directory specified should be retrieved. The directive propset is not required:svn propedit svn:externals local-target-dir
    local-target-dir http://server/svn/dir-remote local-target-dir/subdir -r### http://server/svn/dir-remote2
    svn update svn commit svn propget svn:externals ./The property applies to the directory. Subversion can not list or web browse svn:externals. Check-out ("co"), "export" and "log" can be performed. Must set environment variable "EDITOR", "SVN_EDITOR", "VISUAL" or set the Subversion configuration file (~/.subversion/config) attribute editor-cmd. i.e.: export EDITOR=vi Note: Subversion 1.6 introduces file externals in addition to directory externals. The files however must reside in the same repository. Also, the file must point to a location which exists in your local working directory. [Potential Pitfall]: Apply svn externals to directories and not files. (version 1.4) [Potential Pitfall]: If generating a tag (branch), one should assign the revision number to the external link to truly snapshot the repository for that tag. This revision number should be specified in the tagged branch version of the svn external. [Potential Pitfall]: The revision numbers shown by svn info will reflect the version numbers of the repository in which the files are stored. If the files are imported via an svn external directory, the revision numbers will reflect that of the external repository which the external points to and thus from where the files were imported.
    Command Description
    svn propdel PropertyName file-name svn propdel --revprop -r RevisionName http://url/path Also: pdel, pd Remove property name from files or directories. Remove properties on file in repository.
    svn propedit PropertyName file-name svn propedit --revprop -r RevisionName http://url/path Also: pedit, pe Edit property name of files or directories. Edit properties on file in repository.
    svn propget PropertyName file-name svn propget --revprop -r RevisionName http://url/path Also: pget, pg Print value of property name of files or directories. Print properties on file in repository.
    svn proplist file-name svn proplist * svn proplist --revprop -r RevisionName http://url/path Also: plist, pl List properties of file, files or directory.
    svn propset PROPNAME PropertyValue file-name svn propset PROPNAME --revprop -r RevisionName PropertyValuehttp://url/path svn propset svn:mime-type text/html file-name.dat Also: pset, ps Set properties of file or directory. Set mime type for a file in the repository. Must perform a commit to upload changes to the repository.Set file properties so that "^M"'s are removed upon check-in: svn propset svn:eol-style LF file-name.txt See YoLinux Subversion server configuration tutorial: No ctrl-M.

    Subversion and Graphical diffs for Linux:
    Three types of file differences are covered in this section:
    1. Show file differences made since checkout was made. This shows the changes you have made. It is usefull to perform this before an update.
    2. Show file differences between two files versions stored in Subversion.
    3. Show differences / conflicts, choose and merge. Use our bash script svndiffwrapper which integrates into Subversion's file check-in process.

    1) File differences since checkout:
    The following scripts will allow you to view the changes you have made since checkout. Use the script before running "svn update" as an update will alter the file with diff chevron (>>>>) markers. After performing a "svn update", use tkdiff, gtkdiff or kdiff3 as described below instead of the scripts: Use the following bash shell script to use the graphical diff tool "mgdiff" with Subversion.
    svndiff:
    01 #!/bin/bash
    02 # svndiff 1.0
    03 # usage: svndiff file
    04
    05 if [[ ! -d .svn ]]
    06 then
    07 echo ERROR: You are not working in an SVN directory.
    08 exit 1
    09 fi
    10
    11 rev="--revision HEAD"
    12
    13 if [[ ! -n $1 ]]
    14 then
    15 echo "Usage: svndiff [option] file"
    16 echo "Options:"
    17 echo " -h Diff with latest in repository (HEAD) - Default"
    18 echo " -b Diff with what you had checked out (BASE)"
    19 echo " -c Diff with COMMITTED, the version before BASE"
    20 echo " -p Diff with PREV, the version before COMMITTED"
    21 echo " -r revnum Diff with specified revision (specify integer)"
    22 exit 1
    23 fi
    24
    25 while getopts ":r:hbcp" Option
    26 do
    27 case $Option in
    28 h) rev="--revision HEAD";;
    29 b) rev="--revision BASE";;
    30 c) rev="--revision COMMITTED";;
    31 p) rev="--revision PREV";;
    32 r) rev="--revision $OPTARG";;
    33 *) echo "Incorrect option specified. Use -h or -b or -r #";;
    34 esac
    35 done
    36 shift $(($OPTIND -1))
    37
    38 # Define graphical diff tool
    39 #
    40
    41 # The geometry option used by Motif, Tcl and X based programs
    42 geometry="-geometry 1280x800+0+0"
    43
    44 # The following is for Motif diff
    45 # -w: ignore white space
    46 dif="mgdiff -args -w"
    47
    48 file=$1
    49 prev=${file}_PREV
    50
    51 # Trap bash command signals
    52 # SIGINT 2
    53 # SIGQUIT 3
    54 # SIGTERM 15
    55 trap "rm -f $prev" 2 3 15
    56 svn cat $rev $file > $prev 2>/dev/null
    57 $dif $geometry $prev $file
    58
    59 sleep 1
    60 rm -f $prev
    Compares your current local copy with the latest in the repository (Default "-h").
    OR Use the following bash shell script to use the graphical diff tool "gvimdiff:" with Subversion:
    svndiff:
    01 #!/bin/bash
    02 # usage: svndiff file
    03
    04 if [[ ! -d .svn ]]
    05 then
    06 echo ERROR: You are not working in an SVN directory.
    07 exit 1
    08 fi
    09
    10 # Define graphical diff tool
    11 #
    12
    13 dif="gvimdiff \"+colo morning\" -R"
    14
    15 file=$1
    16 prev=PREV_${file}
    17
    18 # Trap bash command signals
    19 # SIGINT 2
    20 # SIGQUIT 3
    21 # SIGTERM 15
    22 trap "rm -f $prev" 2 3 15
    23 svn cat $file > $prev 2>/dev/null
    24 $dif $prev $file
    25
    26 # Sleep for non-blocking apps like gvimdiff.
    27 # Allow gvimdiff to read file before it is deleted.
    28 sleep 2
    29 rm -f $prev
    Compare your current local copy with the original copy you checked out.

    2) File differences between two revisions:
    This configuration supports the use of GUI diff tools with Subversion by using the command: svn diff -r 457:459 --diff-cmd Some diff tools are supported with native svn. i.e.: svn diff -r 457:459 --diff-cmd kdiff3 file-name while others require a wrapper script to arrange the arguments correctly. Subversion configurations and defaults are specified in the file: $HOME/.subversion/config
    ..
    ...
    
    [helpers]
    editor-cmd = gedit
    diff-cmd = /opt/bin/diffScript
    diff3-cmd = /opt/bin/diff3Script
    
    ...
    ..
    
    This configuration configures Subversion to execute the script /opt/bin/diffScript to launch your own diff toolwith the command: svn diff -r Old:New URL.File: /opt/bin/diffScript
    01 #!/bin/bash
    02
    03 LeftLabel=$3
    04 RightLabel=$5
    05 LeftFile=$6
    06 RightFile=$7
    07
    08 #gtkdiff $LeftFile $RightFile
    09 tkdiff $LeftFile $RightFile -L "$LeftLabel" -L "$RightLabel" &
    10
    11 # wait for command to finish
    12 wait
    Note: To debug what is passed as a command line argument to the diff tool, set the diff-cmd to "echo":
    ..
    ...
    
    [helpers]
    diff-cmd = echo
    
    ...
    ..
    
    This configuration echos to the screen the command line arguments being passed to the diff tool when the following command is executed: svn diff .....i.e. -u -L d0/f01.cpp (revision 1) -L d0/f01.cpp (working copy) d0/.svn/text-base/f01.cpp.svn-base d0/.svn/empty-file

    3) Conflicts, file differences and merge:
    • tkdiff: Subversion conflict resolution merge: tkdiff -conflict file1.cpp Select from tkdiff toolbar: "Merge" + "Show Merge Window" to open third results window.
    • kdiff3 diff and merge: svn diff -r 457:459 --diff-cmd kdiff3 --extensions '-m' file-name
    • svndiffwrapper: Bash script to add options to Merge|Ignore|Accept|Revert etc as a result of a check-in. This script does it all!!
      Edit file: $HOME/.subversion/config
      ...
      
      [helpers]
      diff-cmd = svndiffwrapper
      diff3-cmd = svndiffwrapper
      
      ...
      
      Use our bash script svndiffwrapper to perform this integrated task. By default, uses kdiff3 for diff tool. Can also specify your own choice of diff tool. Place the script in /opt/bin/ for global use or $HOME/bin/ for private user access and set permissions so that script execution is allowed: chmod ugo+x /opt/bin/svndiffwrapper

    List of graphical diff and merge tools:
    • tkdiff: [download] Comes with tkcvs Subversion GUI front-end. Examples of Subversion diffs with tkdiff: (See: tkdiff --help)
      • tkdiff old-URL@revA new-URL@revB
      • tkdiff -r457 -r459 file-name
      Note: Use command "svn log file-name" to view valid revision numbers for the file. Referencing invalid revision numbers as input to tkdiff will not work.
    • gtkdiff: Has diff3 and merge features. Written with GTK+. After gtkdiff-0.8.0, GNOME desktop required.
    • diffUse: Diff/merge GUI tool. Good line matching features. Supports Unicode.
    • kdiff3: Graphical directory and file diff, merge and edit. KDE3/Qt based. Supports drag and drop. Comes with S.u.S.E. distro. (Cross platform) MS/Windows download available. A very good directory and file diff and merge tool.
      • Difference: kdiff3 file1 file2
      • Difference: kdiff3 file1 file2 file3
      • Difference of two files: kdiff3 directory1/file directory2
      • Difference: kdiff3 directory1 directory2
      • Merge: kdiff3 directory1 directory2 -o dest-directory
      • Merge: kdiff3 file1 file2 -m
      • Merge: kdiff3 file1 file2 -o output-file
      • Diff with SVN: svn diff -r 457:459 --diff-cmd kdiff3 file-name
    • Kompare: Ships with (RHEL4/FC3) KDE SDK. [manual]
    • mgdiff: [download] Motif-based graphical file difference browser and merge. Comes with S.u.S.E. distro.
    • Meld: Compare, edit and merge.
    • fldiff: Graphical file and directory diff. (Cross platform)
    • xxdiff: Compare 2 or 3 files and merge. Also compares directories.
    • gvim and gvimdiff

    Subversion GUI interfaces for Linux:
    • TkSVN / TkCVS: Tcl/Tk based GUI. A very good Unix/Linux and MS/Windows GUI front-end to Subversion. Simple to install (requires tk). Supports GUI diff/merge, branching, tagging, editing, check-in/check-out, ... Installation to /usr/local/bin and lib (Add to your path.): (requires RPM: tk version 8.4+)
      • tar xzf tkcvs_8_0_3.tar.gz
      • cd tkcvs_8_0_3
      • ./doinstall.tcl -nox /opt
      Configuration: (See: ~/.tkcvs)
      Set default editor and diff tool:
      ...
      set cvscfg(editor) "xterm -e vim"
      set cvscfg(tkdiff) "tkdiff"
      
      Also see default config file: /opt/lib/tkcvs/tkcvs_def.tcl Sets default editors for various file types. Set editor to "gedit" for rookies.
      If you want to run TkSVN / TkCVS on MS/Windows, download Tk for MS/Windows. It can also be run from the Cygwin environment using Tk provided in the Cygwin shell.
    • Tigris.org: RapidSVN: Dependent on wxWidgets cross platform C++ GUI API. Download RPMs from Dag Wieers:
      • rapidsvn-0.7.2-1.2.el4.rf.i386.rpm
      • wxGTK-2.4.2-5.2.el4.rf.i386.rpm
    • pysvn: Python subversion front-end. (cross platform) [download]
    • eSVN: qt based GUI. Mediocre.
    • KdeSvn: KDE front-end.
    • Subcommander: Subversion GUI client with visual diff and merge tool with support for different text encodings
    • Subview: GTK based subversion (1.3+) client.
    • JSVN: Java SVN client
    • Syncro SVN Client - Commercial product. Editor, diff tool and SVN client in one integrated tool.

    Web Clients:

    Plug-ins:


    Subversion Security Tips:
    One should be aware of a possible Subversion client security hole. The Subversion client authentication will cache your login and password in your home directory in non-encrypted clear text. It will have file system security so others can not read the file however, it still is visible by root or by a root user of the file server if one is used for home directories. Here are three solutions to reduce this potential security vulnerability:
    1. Don't allow Subversion to cache the password: svn commit -F file.txt --no-auth-cache This will request a username and password but will not store it.
    2. Set the Subversion configuration file on server to not cache:
      [auth]
      store-auth-creds = no
      
    3. Delete cached files when you logout. Reduces risk but does not eliminate it. This uses the bash shell logout script to perform a clean-up of the authentication files.
      File: ~/.bash_logout
      1 rm ~/.subversion/auth/svn.simple/*

    Subversion utility commands and scripts:
    Command Description
    svnversion local-path This svn admin command will produce a compact version number for a working copy. Lists range of versions, adds "S" if switched, "M" modified.
    svnchangesince Shows the changes to the subversion repository since the local copy was last updated.
    svnlastlog Displays the last log message that pertains to the current working copy. Simplified svnlastchange.
    svnlastchange Displays the last log message and a unified diff of the changes made in the last commit.
    svn-clean Removes all the files and directories that are not in Subversion.
    List of KDE scripts (See scripts which start with "svn")
    Report Generation: Often one will have to generate a report or source list. The following awk script and command will generate a simple source version description report:
    File: svd_report.awk
    1 BEGIN { RS="";
    2 FS = "\n";
    3 printf("%-75s %5s %-45s\n","Path","Rev","Last Change Date"); }
    4 /^Path:/ { n1 = split($1,path,":");
    5 n2 = split($6,revision,":");
    6 n3 = split($11,changeDate,": ");
    7 printf("%-75s %5s %-45s\n", path[2], revision[2], changeDate[2]); }
    Command to generate the report: svn info -R * | awk -f svd_report.awk The Subversion "info" command will generate a dump of information about all of the files under Subversion control recursively (-R) through all subdirectories. The AWK script will parse the output and generate a simple report. The AWK script views the Subversion output as an AWK record seperated by blank line where the content of each line is deliminated by the ":" (colon). For more information on AWK scripts, see the awk man page

    Subversion Best Practices:
    • ALWAYS compile and test before checking in source code. Subversion revisions should correspond to revisions which compile.
    • Always add check-in comments. Nothing is more obnoxious that looking at a blank log or information history.
    • Monstrous binary files like CD or DVD ISO images are better suited for storage on a file system rather than in Subversion. Subversion will not be able to show differences betwen version and will be slower than a raw filesystem.
    • Don't copy, rename and move directories and files with system shell commands. Use Subversion commands to "rm", "mv", and "add" directories and files and then commit changes when done. Work within Subversion.
    • Commit changes as a single logical changeset for one purpose. Thus all code changes for a single bug fix or enhancement should be checked-in together. This allows one to better follow the history log of changes.
      • Check-in code at the directory level and all changed files, recursively in the directory and subdirectories will be checked in together. svn ci -m "Check-in comment goes here" ./
      • Check-in files together by specifying them explicitly: svn ci -m "Check-in comment goes here" file.cpp file2.cpp ...
    • Tie Bug tracking and Subversion CM together:
      • Use comments when checking-in files into Subversion. Add bug tracking numbers to the comments so Subversion will reference Trac bugs.
      • If using Trac, add trac comments so that links are generated to the Subversion repository by placing the Subversion revision number in square braces (i.e. [1140]) in a Trac comment. In this way, Trac will have a direct URL link to Subversion.
    • If using Trac integrated with Subversion, refer to the Trac ticket in the Subversion check-in comment using a "#" in front of the Trac ticket number (eg. #65) This generates a hyperlink when the Subversion logs are viewed in Trac.
    • Taking code from a Subversion repository for upload to another: Use "svn export" and NOT "svn co" if you want files for upload into another CM repository. A checkout (svn co) will create Subversion management directories (.svn/) in the local working copy. You will not want to upload these directories into a CM system as they are only for the user's local working directory only. An "export" will not create these directories.
    • The "tags" branches are NOT to be used as working branches but are snapshots of an existing branch. The "tags" are for historical reference such as a release, well tested version or progress milestone.
    • Documentation and related artifacts should not be under the source tree but parallel to it. This isolates the source tree so that email notification triggers sent to developers upon source changes will only go out on source changes or regression build and test systems like Cabie will only rebuild and test on source changes rather than on unrelated documentation changes.

3 Item(s)

per page

Set Ascending Direction