Difference between revisions of "BTP300 Practical Tips 2013"
| Line 12: | Line 12: | ||
== Merging From Your Branch Into the Trunk == | == Merging From Your Branch Into the Trunk == | ||
| − | [[Media:SVN_Merge.pdf| | + | '''[[Media:SVN_Merge.pdf|Step by Step Instructions]]''' |
Latest revision as of 01:04, 11 November 2013
Setting Up SVN Branches for Assignments
The following screenshot shows an example of how the main trunk and branches can be set up for the assignments. The trunk contains the main project folder for the team. Each team member has their own branch under the branches folder. The branches contain the latest code by each member. Once a branch is tested, the code can be merged into the trunk. Under the project folder, there are two sub-folders, src containing the source code and scripts containing build scripts for building the test and application programs for each platform (Microsoft, Borland, and Linux). The project folder also contains the following files:
- README - contains information about the project
- ChangeLog - contains a log entry for each commit that describes what was committed
- TestLog - contains a complete history of what was tested on the branch
