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).

• 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:

• 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

/* $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 $
 */

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.

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").

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.

.. ... [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

.. ... [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

• 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

• 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

• 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:

• Kamikaze-qscm: Web based front-end similar to Mozilla Bonsai.
• WebClient for SVN: Implemented in JSP for Tomcat 4
• ViewSVN: PHP4
• Easy SVN: PERL cgi

Plug-ins:

• NaughtySVN: GNOME Nautilus file browser SVN plug-in.
• Ksvn: Subversion client plugin for the KDE Konqueror browser.
• Eclipse plug-ins:
  • Tigris.org: subclipse Also see: C/C++ development environment and Eclipse
  • Subversive

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/*

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.

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

• 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.