Difference between revisions of "Svn rules - OOP344 20111"
| Line 3: | Line 3: | ||
== Standard directories == | == Standard directories == | ||
=== branches === | === branches === | ||
| − | |||
* in here each team member will create a home direcotry using her/his seneca id | * 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. | * each of the following home direcotires will contain several direcotories which of them is a work space for different tasks. | ||
| Line 16: | Line 15: | ||
==== email id 3 ==== | ==== email id 3 ==== | ||
=== tags === | === tags === | ||
| − | + | * 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 === | === trunk === | ||
| − | |||
# holds the currect status of the application | # holds the currect status of the application | ||
# is always in a successful compiled state | # is always in a successful compiled state | ||
==== How to work with trunk ==== | ==== 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 | ||
Revision as of 08:59, 14 January 2011
OOP344 | Weekly Schedule | Student List | Teams | Project | Student Resources
Contents
SVN
Standard directories
branches
- 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 id1
- devbackspace
- leftArrowbug
- workspace 3
- etc....
email id2
email id 3
tags
- 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
- 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
- in trunk status section you must have two things:
