


% subversion handling This file gives some guidelines in the subversion handling and includes: 1) repository layout 2) developer handling 3) merging and publishing


0001 %% subversion handling 0002 % This file gives some guidelines in the subversion handling and includes: 0003 % 1) repository layout 0004 % 2) developer handling 0005 % 3) merging and publishing 0006 0007 %% Repository layout 0008 % The repository comprises the following directories with the corresponding 0009 % use cases: 0010 % branch - with subfolders for each developer. Each developers 0011 % subdirectory contains the folders of the trunk and new or temporary 0012 % files and directories. Cross-merging between branches is NOT 0013 % permitted. 0014 % Requirements: None 0015 % trunk - merges new developments of the branch. It's focus for use is 0016 % to ensure merged changes are properly working before going into 0017 % the pub directory. 0018 % Requirements: all functions execute properly 0019 % pub - could be seen as a release candidate. The trunk is merged here, 0020 % while not all files and folders might enter the release. 0021 % Requirements: all functions execure properly, are documented and 0022 % are tested according to the toolboxLayer 0023 % tag - is used for publications. It might contain copies of all folders 0024 % above and the naming of the subfolders could be: 0025 % pub-version-1.0 0026 % branch-article-CES-May2050 0027 % at least the origin and, hence, the requirement level should be 0028 % indicated in the tag name. 0029 % 0030 % There are linux scripts that help with common operations, like: 0031 % * updating pub from trunk 0032 % * merging a branch to the trunk 0033 % * merging a trunk to a branch 0034 0035 %% Branch folders 0036 % * Do NOT commit binaries or images 0037 % * use the svn:ignore feature to hide binary and reproducable content 0038 0039 %% Trunk folder 0040 % *