'Subversion' Category
-
Dec292006
Subversion – Merging a Branch
First try at merging a branch back into the trunk. A simple case because no changes were made to the trunk while working with the branch.
In the branch working dir:
svn log -v –stop-on-copy
This reports the list of revisions since the branch was created. This range of revisions is used as an argument to [...] -
Dec082006
Subversion – Creating a Branch
Created a branch in my main repository yesterday after running trials on a sample repository. Things snapped into focus after reading Key Concepts Behind Branches from the SVN book, which reinforces the point that Subversion is a versioned file system, and a branch conceptually is merely a copy.
svn copy http://localhost/svn/ll/trunk http://localhost/svn/ll/branches/gui
cd wkgDirectory
svn switch [...] -
Nov242006
Subversion Summary – Conversion Complete
I’ve used Subversion for all of a week and already like it better than CVS. It took weeks to get comfortable with CVS commands, and I needed to constantly relearn them. SVN commands come to mind quite naturally already.
I’m up and running under Subversion and am declaring the conversion from CVS as complete. -
Nov142006
SVN – Apache Authentication, ViewCVS
Adding Basic Authentication
As detailed on 14 Nov, the lack of httpd authentication prevents svn updates from getting an author assigned. So now I’m installing authentication per the Subversion instructions:htpasswd2 -cm /etc/apache2/basicHTTPpasswd bozzie
Cut & pasted the Auth{Type,Name,User} directives from the instructions into the <Location> /svn section of my default-server.conf file. Cut & pasted the [...] -
Nov142006
CVS to SVN, day 2
Trouble with $Id$ and related keyword properties solved after finding a “How to get keywords to work” search result and learing that while double-quotes are required when using svn propset, they must not be used in the config file.
Next, the output of svn diff is a non-standard format, apparently used for creating patch files. [...]