140 likes | 288 Views
Subclipse. Background. Subversion version control system allow multiple users to develop on one project at the same time Subclipse Eclipse plug-in manipulate a project on a Subversion server in the Eclipse environment. Steps to follow when working on a project, in a team. Checkin
E N D
Background • Subversion • version control system • allow multiple users to develop on one project at the same time • Subclipse • Eclipse plug-in • manipulate a project on a Subversion server in the Eclipse environment
Steps to follow when working on a project, in a team. • Checkin • Checkout • Update • Synchronize • Merge • Commit
Adding Subclipse Plug-in to Eclipse • The URL for Subclipse plug-in: http://subclipse.tigris.org/update_1.2.x • Steps: Help > Install New Software > Enter URL > Select the Subversion feature > License Agreement > Install > Restart
SVN Repository Exploring • SVN Repository • SVN Annotate • SVN Resource History
Adding a Repository URL to Subclipse • New > SVN Repository • URL for the repository • Provide your user id and password
Check In • Right click on the project and select Team > Share Project • Eclipse asks if you want to add the project to the existing repository or create a new one. • In the next step: Use project name as module name
Checkout a project • Right click on the repository in the SVN repository exploring • Select checkout • If a project with the same name already exists it is destroyed.
Synchronizing and Committing Resources to the Repository • Any resources that you have modified will have a black asterisk. • Any newly added resources will have a question mark • Right click on the project > Team > Synchronize with Repository • Outgoing changes • Incoming changes
Synchronizing (Contd..) • Red bi-directional arrow – someone modified the file in the repository while you were working on it. • Double click and open the file in compare editor. • Copy-paste the incoming changes in your local file. • Right click on the local file and select Mark as Merged Note: Check thoroughly before selecting Mark as Merged!!!
Commit Three situations for commit: • If there are no conflicts in the synchronize perspective, you can commit your changes • If there are no conflicts but just incoming changes, then update to version and then commit. • If there are conflicts, then you merge, update and commit in that order. Note: Add meaningful comments when you commit your changes.
History • Use • Compare with • Replace with
References: • http://ist.berkeley.edu/as-ag/tools/usage/subclipse-usage-tips.html • http://www.ibm.com/developerworks/opensource/library/os-ecl-subversion/ • http://agile.csc.ncsu.edu/SEMaterials/tutorials/subclipse/index.html#section4_0 • http://svnbook.red-bean.com/nightly/en/svn-book.html