Difference between revisions of "Svn rules - OOP344 20111"

From CDOT Wiki
Jump to: navigation, search
(fixed sentence structure)
(fixd gramer and sentence structure)
Line 25: Line 25:
 
* in your team page there must be a trunk status section
 
* in your team page there must be a trunk status section
 
** in trunk status section you must have two things:
 
** in trunk status section you must have two things:
*** 1 - Status of trunk (commited, commiting)  
+
*** 1 - Status of trunk (committed, committing)  
***2- the id of the person who has commited or is commting the turnk
+
***2- the id of the person who has committed or is committing the turnk
 
**# before committing any changes to trunk, make sure your version is compiled and working.
 
**# 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'''
 
**# make sure the status is NOT '''committing'''; if it is wait for it to change to '''committed'''
Line 32: Line 32:
 
**# start merging your changes  
 
**# start merging your changes  
 
**# resolve conflicts if happens
 
**# resolve conflicts if happens
**# compile again to make sure it successful
+
**# compile again to make sure it is successful
 
**# do the final commit
 
**# do the final commit
 
**# change the status back to committed with your id
 
**# change the status back to committed with your id

Revision as of 10:08, 14 January 2011


OOP344 | Weekly Schedule | Student List | Teams | Project | Student Resources

SVN

Standard directories

branches

  • in here each team member will create a home directory using her/his seneca id
  • each of the following home directories will contain several directories, some of which are work space for different tasks.

email id1

  • devbackspace
  • leftArrowbug
  • workspace 3
  • etc....

email id2

email id 3

tags

  • holds several directories and each 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

  1. holds the currect status of the application
  2. is always in a successful compiled state

How to work with trunk

  • in your team page there must be a trunk status section
    • in trunk status section you must have two things:
      • 1 - Status of trunk (committed, committing)
      • 2- the id of the person who has committed or is committing the turnk
      1. before committing any changes to trunk, make sure your version is compiled and working.
      2. make sure the status is NOT committing; if it is wait for it to change to committed
      3. if status is committed, change it to committing with you id
      4. start merging your changes
      5. resolve conflicts if happens
      6. compile again to make sure it is successful
      7. do the final commit
      8. change the status back to committed with your id

important commands

checkout

  • is the first thing you do to get a copy of the whole, or part of a repository