Branches

Primary tabs

subversion

How to branch a project to work on a fork of your code.

Creating a branch

svn copy http://<your.svn.server>/svn/project/trunk \
http://<your.svn.server>/svn/project/branches/branchname \
-m "Creating branch of /project/trunk"

Switching a Working Copy
The svn switch command transforms an existing working copy into a different branch. As an example, we could take a working copy of a Drupal 5.x website, checked out out from trunk, and switch it into a branch when we want to update the trunk to Drupal 6.x:

cd /path/to/working/copy
svn info | grep URL
svn switch http://<your.svn.server>/svn/project/branches/branchname 
svn info | grep URL

Merging a change from Trunk into the Branch
http://nedbatchelder.com/text/quicksvnbranch.html
http://www.orcaware.com/svn/wiki/Svnmerge.py
http://www.technoids.org/svnmerge.html
http://cheat.errtheblog.com/s/svnmerge
http://research.mosuma.com/faq/howto/svn_branch_merge

Find out what revision your branch is at:

svn log --stop-on-copy

See what the changes are:

svn diff -r 60:75 http://trac.example.com/svn/project/trunk

Merge it (add --dry-run to see what the changes would be):

svn merge --dry-run -r 60:75 http://trac.example.com/svn/project/trunk .
svn merge -r 60:75 http://trac.example.com/svn/project/trunk .

Merging branch into trunk
http://svnbook.red-bean.com/en/1.1/ch04s04.html

Recent Updates

Apache

1 year 11 months ago
Apache

1 year 11 months ago
lighttpd

1 year 12 months ago

php 8.x
MariaDB

1 year 12 months ago

10.6.7
CentOS

1 year 12 months ago

Drop Centos 5/6 stuff

Recent Links

SquidGuard

SquidGuard is a URL redirector used to use blacklists with the proxysoftware Squid. There are two big advantages to squidguard: it is fast and it is free.
NCurses Disk Usage

A disk usage analyzer with an ncurses interface, aimed to be run on a remote server where you don't have an entire gaphical setup, but have to do with a simple SSH connection. ncdu aims to be fast, simple and easy to use, and should be able to run in any minimal POSIX-like environment with ncurses installed.
WPKG

WPKG is an automated software deployment, upgrade and removal program for Windows.

It can be used to push/pull software packages, such as Service Packs, hotfixes, or program installations from a central server (for example, Samba or Active Directory) to a number of workstations.

It can run as a service to install software in the background (silent install), without user interaction.

It can install MSI, InstallShield, PackagefortheWeb, Inno Setup, Nullsoft, other software installers or .exe packages, .bat and .cmd scripts and similar: no more repackaging to perform software installation.

WPKG is open source software.
opsi

opsi (Open PC Server Integration) the Open Source client management system
Vagrant

Vagrant is a tool for building complete development environments. With an easy-to-use workflow and focus on automation, Vagrant lowers development environment setup time, increases development/production parity, and makes the "works on my machine" excuse a relic of the past.

Main menu

You are here

Branches

Primary tabs

Recent Updates

Recent Links