Browse by Tags

All Tags » Subversion (RSS)
Wednesday, June 06, 2007 9:48 PM

How to audit your Subversion branches

One of the greatest features of Subversion (and any other decent source control tool) is the ability to branch. Branching allows development to occur in parallel streams and allows changes to be safely propagated from one development stream to another. These features work well, but one often finds that developers forget to merge their changes back to the main development stream, or to use Subversion's terminology, developers forget to "merge back into the trunk." Now there are several...
Posted by trumpi | with no comments
Filed under: ,
Tuesday, June 05, 2007 8:01 PM

SourceGear release DiffMerge - for free

A good, free, 3-way merging tool is very difficult to come by. Most tools that diff and merge either are not free, or they do not support 3-way merging, or they are simply have limited editing capabilities. Up to now, I have only found one tool that features all of these characteristics. However, SourceGear have now changed that by releasing their DiffMerge tool for free. DiffMerge includes features such as graphical diff, graphical merging between 3 files, folder diff, rulesets per file type and...
Posted by trumpi | 5 comment(s)
Filed under: , , , ,
Wednesday, May 23, 2007 10:01 PM

Shelving in Subversion?

The person whom I report to asked me today whether there is a feature similar to shelving available in Subversion. The good news is that you can "shelve" in Subversion. The bad news is that it requires a bit of admin. In Subversion, the concept of shelving is known as private branching. Here are the steps: Step 1: Create a branch, switching your working copy Let's say that you are working on the trunk and I have some modifications that I would like to shelve. The trunk url is http:...
Posted by trumpi | with no comments
Filed under:
Saturday, April 07, 2007 11:51 AM

Installing Subversion with Windows Authentication - the easy way

So you are developing on a Windows platform and you are part of a Windows domain, but you want to set up Subversion to use your domain credentials. Not a problem - all you need is a Windows XP SP2 or a Windows 2003 machine to host Subversion on. Here are the steps Download and install CollabNet Subversion It is important that you download CollabNet's Subversion , as it will install and integrate the Apache web server as well. Here are screenshots showing some of the options that must be selected...
Posted by trumpi | 1 comment(s)
Filed under:
Wednesday, December 13, 2006 7:43 PM

Subversion on a stick

Subversion is one of the best version control applications. If you've never used Subverion before, then do yourself a favour and go have a look at it. One of the things that I use Subversion for is to synchronise my documents between various computers, be it at home, at work or elsewhere. In the past I had to keep my home computer on and my internet connection active in order to access my documents repository. but now I've found a feature that I'd like to share -- you can access a Subversion...
Posted by trumpi | 10 comment(s)
Filed under:
Sunday, October 01, 2006 12:54 AM

Powershell and Subversion

I'm busy playing around with Powershell, looking particularly at using it to write hook scripts for Subversion. Scott Hanselman has an approach using the NSvn library that comes with AnkhSvn. I will need to look at that approach a bit more in depth, but what impresses me about Powershell is its handling of XML. Those who know SubVersion will know that one of the aims of the Subversion team is to make the output of the command line tools human readable as well as machine readable. So for most tools...
Posted by trumpi | with no comments
Filed under: ,
Thursday, August 31, 2006 12:46 AM

Merging for the not so brave

Anyone who is working in a team and using a half-decent version control system will have come across merging. If not, then you've been lucky. Merging conflicting files frustrates many developers. And I reckon that this is because there is a fear that the merge will not be performed properly, resulting in a loss of work. Today I came across the merge from hell. I performed some work for one of my clients, but the work was done against an old version of their source code. When they discovered this...
Posted by trumpi | with no comments
Filed under: , ,