Open main menu

CDOT Wiki β

Changes

Svn rules - OOP344 20111

976 bytes added, 08:59, 14 January 2011
no edit summary
== Standard directories ==
=== branches ===
<hr />
* in here each team member will create a home direcotry using her/his seneca id
* each of the following home direcotires will contain several direcotories which of them is a work space for different tasks.
==== email id 3 ====
=== tags ===
<hr />* holds several direcotries and each of the is a copy of a completed task of trunk* tags are never to be changed or edited, they are simply copies of success points during the development of the project 
=== trunk ===
<hr />
# holds the currect status of the application
# is always in a successful compiled state
==== How to work with trunk ====
== important commands ==
=== checkout ===
* is the first thing you do to get a copy of the whole, or part of a repository
* in your team page there must be a trunk status section
** in trunk status section you must have two things:
*** 1 - Status of trunk (commited, commiting)
***2- the id of the person who has commited or is commting the turnk
**# before committing any changes to trunk, make sure your version is compiled and working.
**# make sure the status is NOT '''committing'''; if it is wait for it to change to '''committed'''
**# if status is committed, change it to committing with you id
**# start merging your changes
**# resolve conflicts if happens
**# compile again to make sure it successful
**# do the final commit
**# change the status back to committed with your id