Revision of Branches from Thu, 06/25/2009 - 16:44

Revisions allow you to track differences between multiple versions of your content, and revert back to older versions.

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"

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

See what the changes are:

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

Merge it:

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

Recent Updates

nginx

8 months 3 weeks ago

1.27.2 update
lighttpd

9 months 4 days ago

Drupal 10/11 config
Drupal 11

9 months 6 days ago
PHP

9 months 6 days ago

PHP 8.3.11 and AlmaLinux
Pound SSL Proxy

9 months 6 days ago

New version of Pound

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

Revision of Branches from Thu, 06/25/2009 - 16:44

Recent Updates

Recent Links