Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
student:eclipse:subversion [2019/02/13 16:49] – bernstdh | student:eclipse:subversion [2020/07/17 16:45] (current) – bernstdh | ||
---|---|---|---|
Line 4: | Line 4: | ||
There are two different Eclipse plugin that integrate Subversion (SVN) | There are two different Eclipse plugin that integrate Subversion (SVN) | ||
- | with Eclipse, Subversive and Subclipse. | + | with Eclipse, Subversive and Subclipse. They are very similar in many ways. |
- | ==== Installing Subversive | + | ==== Installation |
- | There are three different ways to start the process of installing Subversive. | + | There are two different ways to start the process of installing Subversive |
- | However, before you start note that **it may be difficult to install the SVN Connector on Windows machines running Eclipse Oxygen**. If this is your current environment then you have two options - install Eclipse Neon instead or figure out how to install the connector (which is available from Polarion.com) manually. (Bug report [[ https:// | + | However, before you start note that **it may be difficult to install the SVN Connector on Windows machines running Eclipse Oxygen**. If this is your current environment then you have two options - install Eclipse Neon instead or figure out how to install the connector (which is available from Polarion.com) manually. (Bug report [[ https:// |
Line 23: | Line 23: | ||
- Start Eclipse. | - Start Eclipse. | ||
- Click on < | - Click on < | ||
- | - Enter '' | + | - Enter '' |
- | - Click on " | + | - Click on " |
=== Starting the Process with the Installer === | === Starting the Process with the Installer === | ||
Line 33: | Line 33: | ||
- Click on < | - Click on < | ||
- In the "Work with" list, select the appropriate version of Eclipse. | - In the "Work with" list, select the appropriate version of Eclipse. | ||
- | - Expand the " | + | - Expand the " |
- Click on " | - Click on " | ||
- | === Starting the Process with a WWW Browser === | ||
- | To start the installation using a WWW browser you should: | ||
- | - Start Eclipse. | + | === After the Process is Completed === |
- | - Start a WWW browser. | + | |
- | - Navigate to '' | + | |
- | - Drag the " | + | |
- | === After the Process has Started === | + | Regardless of how you start the process, after it is completed you should restart Eclipse. |
- | Regardless of how you start the process, after it is started | + | If you are installing Subclipse, you may be prompted to install the SVN Connectors in a dialog box. **IF NOT AND YOU ARE USING SUBCLIPSE, YOU MUST FORCE THIS PROCESS MANUALLY |
- | + | ||
- | - When the dialog box appears, click on < | + | |
- | - When the next dialog box appears (which | + | |
- | - Restart Eclipse. | + | |
- | - You should now be prompted to install the SVN Connectors in a dialog box. **IF NOT, YOU MUST FORCE THIS PROCESS MANUALLY | + | |
- Select an appropriate connector -- SVN Kit can be used on all platforms; Native JavaHL can only be used on Windows machines that have an '' | - Select an appropriate connector -- SVN Kit can be used on all platforms; Native JavaHL can only be used on Windows machines that have an '' | ||
- Click on < | - Click on < | ||
Line 59: | Line 49: | ||
- When the next dialog appears check "I accept..." | - When the next dialog appears check "I accept..." | ||
- Restart Eclipse. | - Restart Eclipse. | ||
+ | |||
+ | |||
+ | You can change the SVN interface by clicking on < | ||
==== Connecting to Subversion on stu ==== | ==== Connecting to Subversion on stu ==== | ||
+ | |||
+ | === Protocol === | ||
Some Subversions Repository Servers use '' | Some Subversions Repository Servers use '' | ||
- | | + | === Identifying a Repository === |
- | - If you are not already, use the SVN perspective by clicking | + | |
+ | | ||
+ | - If you are not already, use the SVN perspective by clicking on < | ||
- Click on {{eclipse_new-repository-location.gif}}. | - Click on {{eclipse_new-repository-location.gif}}. | ||
- | - After the dialog box opens, | + | - After the dialog box opens, enter the URL in the " |
- | - On the "SSH Settings" | + | - Complete the process. |
- | | + | |
+ | === Authentication === | ||
+ | |||
+ | The plugin will need to authenticate with '' | ||
+ | |||
+ | * You may (it varies with the plugin) be given the opportunity to < | ||
+ | |||
+ | * You can create an [[student: | ||
+ | |||
+ | In either case, **should not save your authentication information on a " | ||
- | ==== Using Subversive | + | ==== Using the Plugin |
- | The Subversive | + | The Subversive |
Eclipse. | Eclipse. | ||
Line 100: | Line 106: | ||
an * character before it's name in the file tab (there will be no indicator | an * character before it's name in the file tab (there will be no indicator | ||
in the // | in the // | ||
- | |||
- | |||
- | === Check-Out === | ||
- | |||
- | **Assuming you have already added one or more repository locations to | ||
- | Subversive**, | ||
- | create a local/ | ||
- | |||
- | - If you are not already, use the SVN perspective by clicking on < | ||
- | - Right-click on the appropriate repository. | ||
- | - Pull down to " | ||
- | - Check "Check out as a project configured using the New Project Wizard" | ||
- | |||
- | Another way is to: | ||
- | |||
- | - Click on < | ||
- | - Select "Use existing repository", | ||
- | - Add the project name to the end of the URL (since there may be more than one project in the repository) and click < | ||
- | - Check "Check out as a project with the name specified", | ||
Line 129: | Line 116: | ||
- When the dialog box appears, select the appropriate repository type (i.e., SVN) and click on < | - When the dialog box appears, select the appropriate repository type (i.e., SVN) and click on < | ||
- When the next dialog box appears, check "Use existing repository location", | - When the next dialog box appears, check "Use existing repository location", | ||
- | - Select | + | - If prompted to choose a mode, select |
- Click on < | - Click on < | ||
When the SVN window appears, enter a commit comment (like " | When the SVN window appears, enter a commit comment (like " | ||
- | | + | |
=== Add a File to Version Control === | === Add a File to Version Control === | ||
Line 142: | Line 129: | ||
- Pull down to " | - Pull down to " | ||
| | ||
+ | | ||
+ | |||
+ | === Check-Out === | ||
+ | |||
+ | **Assuming you have already added one or more repository locations to | ||
+ | Subversive**, | ||
+ | create a local/ | ||
+ | |||
+ | - If you are not already, use the SVN perspective by clicking on < | ||
+ | - Expand the appropriate repository. | ||
+ | - Right-click on the appropriate project. | ||
+ | - Pull down to "Check Out". | ||
+ | |||
+ | Another way is to: | ||
+ | |||
+ | - Click on < | ||
+ | - Select "Use existing repository", | ||
+ | - Add the project name to the end of the URL (since there may be more than one project in the repository) and click < | ||
+ | - Check "Check out as a project with the name specified", | ||
+ | |||
=== Update === | === Update === | ||
Line 149: | Line 156: | ||
- Right-click on the appropriate folder/ | - Right-click on the appropriate folder/ | ||
- | - Pull down to " | + | - Pull down to " |
=== Viewing/ | === Viewing/ | ||
Line 165: | Line 172: | ||
- Right-click on the file(s). | - Right-click on the file(s). | ||
- | - Pull down to < | + | - Pull down to < |
- Perform the commit. | - Perform the commit. | ||
You might also be interested in the video at | You might also be interested in the video at | ||
[[ https:// | [[ https:// | ||
+ | |||
+ | |||
+ | |||
+ | === Editing Conflicts === | ||
+ | |||
+ | If you have any conflicts after you perform an update, you can edit them | ||
+ | as follows: | ||
+ | |||
+ | - Right-click on the file(s). | ||
+ | - Pull down to < | ||
+ | - Use the icons to move between conflicts and accept particular edits. | ||
+ | |||
=== Commit === | === Commit === | ||
Line 191: | Line 210: | ||
- Pull down " | - Pull down " | ||
- | === Compare Versions of a File (i.e., diff) === | + | === Compare Versions of a File === |
To compare different versions of the same file: | To compare different versions of the same file: | ||
Line 220: | Line 239: | ||
- Right-click on the appropriate folder/ | - Right-click on the appropriate folder/ | ||
- | - Pull down to " | + | - Pull down to " |
and then commit the folder/ | and then commit the folder/ | ||
Line 254: | Line 273: | ||
The following Subversion commands would normally be preceded by | The following Subversion commands would normally be preceded by | ||
- | '' | + | '' |
right-clicking on the file/ | right-clicking on the file/ | ||
- | ^ SVN Command ^ Subversive | + | ^ SVN Command ^ Plugin |
| '' | | '' | ||
| '' | | '' | ||
Line 263: | Line 282: | ||
| '' | | '' | ||
| '' | | '' | ||
- | | '' | + | | '' |
| '' | | '' | ||
| '' | | '' | ||
- | | '' | + | | '' |