Changes between Version 23 and Version 24 of SettingUpEclipse

Timestamp:

Dec 31, 1969, 4:20:57 PM (54 years ago)

Author:

Peter Powers

Comment:

--

SettingUpEclipse

@@ -5 +5 @@
 Two options are available to obtain the OpenSHA source code:
  1. ''`Browse Source`'' on this website. Once in the ''`trunk`'' folder, the current release code may be downloaded as a zip file (the link is at the bottom of the page)
+
  2. Check the codebase out from our Subversion repository. Instructions on how to do this from within Eclipse are provided below.
 
@@ -48 +49 @@
  * Once it is checked out, switch to the Java perspective  ''`Window > Open Perspective > Java`'' (or ''`Other`'', then ''`Java`'').
  * More patience, it will probably take a little while to build the project as well (you should see ''`Building Workspace`'' in the lower right corner of the Eclipse window.
+[[BR]][[BR]]
 
 == Working with OpenSHA ==
 
-The instructions above will enable any registered user to get a copy of the codebase. However, any new code by authorized developers must be committed to the repository on a branch. There are many
+The instructions above will enable any registered user to get a copy of the ''`trunk`'' or current codebase. Any new code by authorized developers, however, must be committed to the repository on a ''`branch`''. The details of merging and branching are outlined in detail in [http://svnbook.red-bean.com/ The SVN Book] and we encourage everyone involved to keep it handy. Some very basic instructions and guidelines are provided below.
+[[BR]][[BR]]
+
+== Branching ==
+OpenSHA development occurs on branches. To create a branch:
+
+ * Switch to the ''`SVN Repository Exploring`'' perspective (see step 3 above).
+ * Right click on ''`trunk`'' and select ''`Branch/Tag...`'':
+[[Image(http://intensity.usc.edu/trac/opensha/attachment/wiki/SettingUpEclipse/svn_branch.png?format=raw)]]
+
+ * In the window that follows, enter:
+  `http://intensity.usc.edu/svn/opensha/branches/username_branchname`
+  (replace ''`username`'' and ''`branchname`'' as appropriate)
+
+ * Click ''`Finish`'' (or ''`Next`'' for more advanced options).
+
+
+== Merging ==
+
+
+