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.
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.
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
- Log in to post comments