Lifehacks. Modular. Migration. Ancient Programming » Blog Archive » Best practise when handling tags and branches (using subversion) This is the way I prefer tagging and branching my code when developing and releasing software.
I use subversion but the overall guidelines can be applied by any versioning tool - say CVS. I assume that you keep your source in the recommended structure: trunktagsbranches Versioning Always use three digits to denote a release: major.minor.bugfix. ex: 1.2.0. Name your trunk code like this: major.minor-SNAPSHOT, where major.minor denotes the next version to release. ex: The version in production is 1.2.0, you should name the trunk version 1.3-SNAPSHOT. Releasing When releasing your code, you should tag the version you release by the version. At the same time you should change your trunk version t0 1.4-SNAPSHOT. Branching If your newly created release contains a bug that can’t wait to be fixed until your next trunk release, you should create a branch.
You should name your branch like this: major_minor_bugfix, where major and minor is the same as the software in production. Merging Merging $ svn up. Setting Up A Subversion Repository Using Apache, With Auto Updatable Working Copy. Overview: What is Subversion?
Subversion is a free/open-source version control system. That is, Subversion manages files and directories over time. A tree of files is placed into a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. Subversion can access its repository across networks, which allows it to be used by people on different computers. Setting up Subversion and websvn on Debian. Setting up Subversion and websvn on Debian Purpose of this howto This howto will illustrate a way to install and configure Subversion and websvn on a Debian server with the following features: multiple repository Subversion access to the repositories via WebDAV (http, https) and ssh Linux system account access control and/or Apache level access control a secured websvn (php web application for easy code browsing) configured syntax coloring in websvn with gnu enscript I will not specifically configure inetd with svnserve in this howto.
Rest assured that Subversion will be totally functional without it. You can copy/paste most of the howto to get it working. Packages that are assumed to already be installed This howto assumes PHP and apache2 are installed and configured. Blogtastic. 039;s Subversion page. Xcode 2.1 User Guide: Using Subversion. Mere-Moments Guide to installing a Subversion server on Windows. Update: This Guide is now largely obsolete, because Brian wrote an installer that will do all this stuff for you.
Check out his annoucement*, or go straight to the svn1clicksetup project page on tigris. * Or you can check out my announcement about his announcement. It’ll work either way. Subversion sounds pretty cool. It’s a mature, powerful revision-control system that acts a lot like CVS, adds support for atomic commits and real renames, just won the Jolt award, and is free. I’ve been intending to install Subversion for quite a while, but I kept putting it off, because it looked like a daunting task. Here, then, is the Mere-Moments Guide to installing a Subversion server on Windows. Some quick notes on the Guide: These instructions assume you’re using Windows 2000 or XP. And now, on to the Guide. Setting up a Secure Subversion Server. By Dru Lavigne, author of BSD Hacks 05/12/2005 Recently a client hired a team of web developers to assist his overworked web administrator.
They asked me to set up a revision-control system to ensure that no one on the team inadvertently overwrote another member's work and to give the administrator the flexibility of rolling back to any version of a file. My first thought was Subversion, as it is the revisioning system I used with my editor when writing BSD Hacks A search for subversion in the Ports Collection indicated that there are also several related ports. For example, esvn looked like an excellent match for the client, as this GUI front end works from Unix, Mac OS X, and Windows. That's perfect for a web development team short on Unix skills who would be accessing data stored on a FreeBSD server from non-FreeBSD operating systems.
This week's article demonstrates how to create a secure repository using Subversion. Preparing the System # vi /etc/group svn:*:3690:webadmin 1 to 9 of 9.