Difference between revisions of "Svn rules - OOP344 20111"

From CDOT Wiki
Jump to: navigation, search
(→‎fixed directories spelling error)
(→‎fix font editing)
 
(6 intermediate revisions by 2 users not shown)
Line 1: Line 1:
 
{{OOP344 Index | 20111}}
 
{{OOP344 Index | 20111}}
−
= SVN =  
+
= SVN =
−
== Standard directories ==
+
== Standard Directories ==
−
=== branches ===
+
=== Branches ===
−
* in here each team member will create a home direcotry using her/his seneca id
+
<hr />
−
* each of the following home direcotires will contain several direcotories which of them is a work space for different tasks.
+
==== Email ID 1 ====
−
*:
+
===== Backspace bug =====
−
==== email id1 ====
+
===== Right key =====
−
* devbackspace
 
−
* leftArrowbug
 
−
* workspace 3
 
−
* etc....
 
  
−
==== email id2 ====
+
==== wliang11 ====
−
==== email id 3 ====
+
===== Fix Segmentation Fault at exit =====
−
=== tags ===
+
==== Email ID 3 ====
−
* holds several directories and each of the is a copy of a completed task of trunk
+
* Create home directories for team members using your Seneca email ID
−
* tags are never to be changed or edited, they are simply copies of success points during the development of the project
+
* Under each home directory, there will be several directories for tasks being done on the project
 +
* These directories are copies of trunk for different goals
 +
=== Tags ===
 +
<hr />
 +
* Tags are snapshots of successful stages of the project
 +
* Each tag is called a release
 +
* Each tag is a copy of trunk
 +
* Each tag also should hold one directory called '''submission logs'''
 +
* In submission logs each student will have a file named as "emailid.txt"
 +
==== prj0.1 ====
 +
==== prj0.12====
  
−
=== trunk ===
+
=== Trunk ===
−
# holds the currect status of the application
+
<hr />
−
# is always in a successful compiled state
+
* Holds the current status of the project
 +
* Latest compiled and working version of the project
 +
* Should always be able to compile
 
==== How to work with trunk ====
 
==== How to work with trunk ====
−
* in your team page there must be a trunk status section
+
* In your team page you have a trunk status section
−
** in trunk status section you must have two things:
+
** In your trunk status section you have two major information
−
*** 1 - Status of trunk (commited, commiting)  
+
** 1- Status of the trunk (committed, committing)  
−
***2- the id of the person who has commited or is commting the turnk
+
** 2- The identity of the person who did commit or is committing
−
**# before committing any changes to trunk, make sure your version is compiled and working.
+
**# Before committing or merging your code 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'''
+
**# Update your trunk to make sure it has all the changes, others made
−
**# if status is committed, change it to committing with you id
+
**# Make sure the status is NOT '''committing'''; if it is, wait for it to be changed to '''committed'''
−
**# start merging your changes  
+
**# If status is committed, change it to committing and update the identity part with your information
−
**# resolve conflicts if happens
+
**# Start merging your changes to trunk
−
**# compile again to make sure it successful
+
**# Resolve possible conflicts
−
**# do the final commit
+
**# Compile again to make sure everything is ok
−
**# change the status back to committed with your id
+
**# Do the final commit
 +
**# Change the status to committed
  
−
== important commands ==
+
=== Important commands ===
−
=== checkout ===
+
==== Checkout ====
−
* is the first thing you do to get a copy of the whole, or part of a repository
+
* Is the first thing you do to get a copy of the repository
 +
==== Add ====
 +
* It is to mark a new file or directory (be selective) to be added to the repository at next '''commit'''
 +
==== Update ====
 +
* Is to bring changes from the repository to your local copy
 +
==== Export ====
 +
* Is to get a non-versioned copy of part or whole repository
 +
==== Import ====
 +
* Copies local file/directories to a repository
 +
== Resources ==
 +
 
 +
* [http://subversion.tigris.org/ Subversion (SVN)]
 +
* [http://tortoisesvn.net/downloads Download Page of TortoiseSVN]
 +
* [http://tortoisesvn.net/docs/release/TortoiseSVN_en/index.html TortoiseSVN Documentation]
 +
* [http://svnbook.red-bean.com/ SVN book at red-bean.com] or download[https://cs.senecac.on.ca/~fardad.soleimanloo/oop344/notes/svn-book.pdf the PDF from here].
 +
* [http://www.rapidsvn.org/download/release/0.12/RapidSVN-0.12.0-8051.dmg RapidSVN] a SVN Client for Mac
 +
* [http://zenit.senecac.on.ca/wiki/index.php/How_to_set_up_tab_spaces Changing Tab Key Behaviour in Certain IDEs]
 +
* [http://ankhsvn.open.collab.net/ AnkhSVN - Free Visual Studio SVN Integration Alternative To VisualSVN]

Latest revision as of 11:29, 14 January 2011


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

SVN

Standard Directories

Branches

Email ID 1

Backspace bug
Right key

wliang11

Fix Segmentation Fault at exit

Email ID 3

  • Create home directories for team members using your Seneca email ID
  • Under each home directory, there will be several directories for tasks being done on the project
  • These directories are copies of trunk for different goals

Tags

  • Tags are snapshots of successful stages of the project
  • Each tag is called a release
  • Each tag is a copy of trunk
  • Each tag also should hold one directory called submission logs
  • In submission logs each student will have a file named as "emailid.txt"

prj0.1

prj0.12

Trunk

  • Holds the current status of the project
  • Latest compiled and working version of the project
  • Should always be able to compile

How to work with trunk

  • In your team page you have a trunk status section
    • In your trunk status section you have two major information
    • 1- Status of the trunk (committed, committing)
    • 2- The identity of the person who did commit or is committing
      1. Before committing or merging your code to trunk, make sure your version is compiled and working
      2. Update your trunk to make sure it has all the changes, others made
      3. Make sure the status is NOT committing; if it is, wait for it to be changed to committed
      4. If status is committed, change it to committing and update the identity part with your information
      5. Start merging your changes to trunk
      6. Resolve possible conflicts
      7. Compile again to make sure everything is ok
      8. Do the final commit
      9. Change the status to committed

Important commands

Checkout

  • Is the first thing you do to get a copy of the repository

Add

  • It is to mark a new file or directory (be selective) to be added to the repository at next commit

Update

  • Is to bring changes from the repository to your local copy

Export

  • Is to get a non-versioned copy of part or whole repository

Import

  • Copies local file/directories to a repository

Resources

Retrieved from "https://wiki.cdot.senecapolytechnic.ca/w/index.php?title=Svn_rules_-_OOP344_20111&oldid=54794"