Releases

Current version
Git/Latestdiff: 1.5.6

Latest Snapshots
Produced after each commit or rebase to new upstream version

GIT clone e.g. at git://git.rsbac.org/linux-6.18.y

GIT Web at GitHub and Launchpad

Events

No events planned

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

--- documentation:svn [2005/12/08 16:15] – corrected URL kang
+++ documentation:svn [2006/06/02 11:03] (current) – removed kang
@@ Line 1: / Line 1: @@
-//If you want to add code for RSBAC, you probably also want to read [[documentation:svk|SVK]] documentation.//
-\\
-===== The RSBAC SVN structure =====
-// Theses are examples only ! //
-<code>
- -- ila
-    -- trunk
-    -- tags
-    -- branches
- -- linux-kernel
-    -- 2.4
-        -- trunk
-        -- tags
-            -- linux-rsbac-2.4.30-1.2.4
-            -- linux-rsbac-2.4.31-1.2.4
-            -- linux-rsbac-2.4.31-1.2.5rc1
-            -- linux-rsbac-2.4.32-1.3.0
-            -- linux-rsbac-2.4.32-1.3.1
-        -- branches
-            -- linux-rsbac
-    -- 2.6
-        -- trunk
-        -- tags
-            -- linux-rsbac-2.6.10-1.2.4
-            -- linux-rsbac-2.6.11-1.2.4
-            -- linux-rsbac-2.6.11-1.2.5rc1
-            -- linux-rsbac-2.6.12-1.3.0
-            -- linux-rsbac-2.6.12-1.3.1
-        -- branches
-            -- linux-rsbac
- -- rsbac-admin
-    -- trunk
-    -- tags
-        -- 1.2.4
-        -- 1.2.5rc1
-        -- 1.3.0
-    -- branches
- -- rsbac-regression
-    -- trunk
-    -- tags
-    -- branches
-</code>
-==== What are trunk and all that ? ====
-People using a versioning tool like SVN use to have three separate directory per project:
-  * **trunk** is meant to be the latest and greatest, what's currently being worked on.
-  * **tags** contains every releases, they are pulled from trunk or a branch when developpers decides that its stable for a nex release. Bugfixing made for theses very stabtle releases are based on the ctags versions, not trunk.
-  * **branches** are derivation from the work being done on trunk. They share the same code but are growing quite differently.
-RSBAC uses this structure for every project hosted, however, the "linux-kernel" project is a bit different:
-  * trunk are the versions released from kernel.org
-  * RSBAC versions are a in a branch from trunk, called linux-rsbac
-This allow easy merging when Linux upgrades to a new version.
-===== Working with SVN =====
-=== So, how do I checkout the latest linux-rsbac kernel ? ===
-<code>
-# mkdir ~/code/rsbac_repos/
-# cd ~/code/rsbac_repos/
-</code>
-Be sure to replace "2.6" by "2.4" for the 2.4 kernel.
-//For anonymous checkout//
-<code>
-# svn checkout svn://mprivacy-update2.de/rsbac1/linux-kernel/2.6/\
-branches/linux-rsbac
-</code>
-//For developpers with write access//
-<code>
-# svn checkout svn+ssh://<you@>mprivacy-update2.de/daten/\
-subversion/rsbac1/linux-kernel/2.6/branches/linux-rsbac
-</code>
-=== Great, what about comitting, updating, etc ? ===
-Be sure to always update the repository before doing anything:
-<code>
-# svn update
-</code>
-Check what you are gonna commit, if you want to make sure:
-<code>
-# svn status
-</code>
-Check commit the actual thing:
-<code>
-# svn commit
-</code>
-A list of the modified file will be presented to you. Check that you modified only what you wanted. Do not make a commit for every next file, but for a set of changes instead. Make **sure** to write a comment about what you did (e.g.: Added feature XXX. Fixed Mantis Bug #3840). If you do not, we will get you and kill you :-)
-Alternatively, you can specify the comment directly on the command line:
-<code>
-# svn commit -c "kang: Added feature XXX. This fixes Mantis bug #3840"
-</code>
-**Never** commit something "just to test" or break something intentionally in the tree.
-Try to make one commit per set of features.
-=== Ok, I will take extreme care. What about diffing and creating patches ? ===
-Simple, this will show you differences:
-<code>
-# svn diff linux-kernel/2.6/trunk linux-kernel/2.6/branches/linux-rsbac
-</code>
-Alternatively, this will create a nice and ready to use patch (make sure you have svn-diff installed!):
-<code>
-# svn diff --diff-cmd=$(which svn-diff) linux-kernel/2.6/trunk\
-linux-kernel/2.6/branches/linux-rsbac
-</code>
-If you want to overring diffing settings and use the "svn-diff" wrapper automatically edit your "$HOME/.subversion/config" and add the following lines (make sure of the path to the "svn-diff" binary!):
-<code>
-	[helpers]
-	diff-cmd = /usr/bin/svn-diff
-</code>
-=== How to I create a tagged version ? ===
-Nothing simpler either:
-<code>
-# svn copy linux-kernel/2.6/branches/linux-rsbac linux-kernel/2.6/tags/linux-rsbac-2.4.31-1.2.5rc2
-</code>
-Do not ever touch again tagged versions. Thoses *will* stay this way.
-When doing a bugfix, create a new tag from this one.
-=== Ok, a new version of the Linux kernel has been uploaded to trunk. How do I merge it into linux-rsbac branch ? ===
-Here we go again:
-  * Replace <first> by the old svn revision of the trunk
-  * Replace <last> by the new svn revision of the trunk
-<code>
-# cd linux-kernel/2.6/linux-rsbac
-# svn merge -r <first>:<last> linux-kernel/2.6/trunk
-</code>
-SVN will merge everything for you and show the conflicts. Fix thoses and commit.. Here you are, you upgraded the branch to the new Linux kernel version :-)
-=== I use my SVN tree to build the kernel and I don't want SVN to care about all the files it creates ! ===
-<code>
-# cd /tmp
-# wget http://www.moses.uklinux.net/patches/dontdiff
-# cd ~/code/rsbac_repos/linux-kernel/2.6/branches/linux-rsbac
-# svn propset svn:ignore -R -F /tmp/dontdiff .
-# svn commit -m "Added svn:ignore properties."
-</code>

//