This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 2f0dfef Automated site publishing by Jenkins build 508
2f0dfef is described below
commit 2f0dfef28259dfa15f18123edce73a3ddadc47bc
Author: jenkins <[email protected]>
AuthorDate: Thu Jan 24 22:49:20 2019 +0000
Automated site publishing by Jenkins build 508
---
content/kb/docs/ide/subversion.html | 149 +++++++++++++++++++++---------------
1 file changed, 89 insertions(+), 60 deletions(-)
diff --git a/content/kb/docs/ide/subversion.html
b/content/kb/docs/ide/subversion.html
index 94205a2..6c36517 100644
--- a/content/kb/docs/ide/subversion.html
+++ b/content/kb/docs/ide/subversion.html
@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
- <title>Using Subversion Support in NetBeans IDE</title>
+ <title>Using Subversion in Apache NetBeans</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Using Subversion Support in NetBeans IDE
- Apache NetBeans">
<meta name="author" content="Apache NetBeans">
@@ -78,26 +78,45 @@
</section>
<div class='grid-container main-content tutorial'>
- <h1 class="sect0">Using Subversion Support in NetBeans IDE</h1>
+ <h1 class="sect0">Using Subversion in Apache NetBeans</h1>
<div id="toc" class="toc">
<div id="toctitle"></div>
<ul class="sectlevel1">
-<li><a href="#_using_subversion_support_in_netbeans_ide">Using Subversion
Support in NetBeans IDE</a>
+<li><a href="#_setting_up_subversion">Setting up Subversion</a>
<ul class="sectlevel2">
-<li><a href="#_setting_up_subversion">Setting up Subversion</a></li>
-<li><a href="#_synchronizing_local_files_with_a_repository">Synchronizing
Local Files with a Repository</a></li>
-<li><a href="#_editing_sources">Editing Sources</a></li>
-<li><a href="#_committing_sources_to_a_repository">Committing Sources to a
Repository</a></li>
-<li><a href="#_summary">Summary</a></li>
+<li><a href="#_specifying_the_path_to_the_subversion_executable">Specifying
the Path to the Subversion Executable</a></li>
+<li><a href="#_ensuring_you_have_a_repository_to_connect_to">Ensuring you have
a Repository to Connect to</a></li>
</ul>
</li>
+<li><a href="#_synchronizing_local_files_with_a_repository">Synchronizing
Local Files with a Repository</a>
+<ul class="sectlevel2">
+<li><a href="#_opening_a_subversion_project_in_the_ide">Opening a Subversion
Project in the IDE</a></li>
+<li><a href="#_checking_out_files_from_a_repository">Checking out Files from a
Repository</a></li>
+<li><a href="#_importing_files_into_a_repository">Importing Files into a
Repository</a></li>
+</ul>
+</li>
+<li><a href="#_editing_sources">Editing Sources</a>
+<ul class="sectlevel2">
+<li><a href="#_viewing_changes_in_the_source_editor">Viewing Changes in the
Source Editor</a></li>
+<li><a href="#_viewing_file_status_information">Viewing File Status
Information</a></li>
+<li><a href="#_comparing_file_revisions">Comparing File Revisions</a></li>
+<li><a href="#_merging_file_revisions">Merging File Revisions</a></li>
+</ul>
+</li>
+<li><a href="#_committing_sources_to_a_repository">Committing Sources to a
Repository</a>
+<ul class="sectlevel2">
+<li><a href="#_updating_local_copies">Updating Local Copies</a></li>
+<li><a href="#_resolving_conflicts">Resolving Conflicts</a></li>
+<li><a href="#_performing_the_commit">Performing the Commit</a></li>
+</ul>
+</li>
+<li><a href="#_summary">Summary</a></li>
</ul>
</div>
-<div class="sect1">
-<h2 id="_using_subversion_support_in_netbeans_ide">Using Subversion Support in
NetBeans IDE</h2>
+<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
-<p>NetBeans IDE provides tight integration with Subversion client versions
1.6.x and higher. The IDE’s Subversion support is designed to help
streamline the development process for groups working from a shared repository,
enabling you to perform versioning tasks directly from your project system
within the IDE.</p>
+<p>Apache NetBeans provides tight integration with Subversion client versions
1.6.x and higher. The IDE’s Subversion support is designed to help
streamline the development process for groups working from a shared repository,
enabling you to perform versioning tasks directly from your project system
within the IDE.</p>
</div>
<div class="paragraph">
<p>This document demonstrates how to perform basic versioning tasks in the IDE
by guiding you through the standard workflow when using versioning software.</p>
@@ -121,8 +140,11 @@
</li>
</ul>
</div>
-<div class="sect2">
-<h3 id="_setting_up_subversion">Setting up Subversion</h3>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_setting_up_subversion">Setting up Subversion</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Before you can take advantage of the IDE’s Subversion support, you
need to have Subversion client software installed on your computer. The
IDE’s Subversion support works by interacting with the Subversion client
to carry out versioning commands. Depending on your system, and whether you
install the Subversion client to a non-default location, you may also need to
register the path to the Subversion executable in the IDE. Finally, you need to
make sure that you have a Subve [...]
</div>
@@ -139,8 +161,8 @@
</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_specifying_the_path_to_the_subversion_executable">Specifying the Path
to the Subversion Executable</h4>
+<div class="sect2">
+<h3 id="_specifying_the_path_to_the_subversion_executable">Specifying the Path
to the Subversion Executable</h3>
<div class="paragraph">
<p>NetBeans IDE automatically tries to identify the location of the Subversion
executable file by using the <code>$PATH</code> system variable on your
computer. Depending on your platform however, or whether you installed the
Subversion client to a different location, it may be necessary to specify the
path to the executable file explicitly.</p>
</div>
@@ -183,8 +205,8 @@
</ol>
</div>
</div>
-<div class="sect3">
-<h4 id="_ensuring_you_have_a_repository_to_connect_to">Ensuring you have a
Repository to Connect to</h4>
+<div class="sect2">
+<h3 id="_ensuring_you_have_a_repository_to_connect_to">Ensuring you have a
Repository to Connect to</h3>
<div class="paragraph">
<p>Before invoking Subversion actions from the IDE, make sure you have access
to a Subversion repository. The IDE <em>does not</em> provide support for
creating Subversion repositories as this is not a frequently used action (In a
production environment a repository is only created once, after the design of
the repository layout has been determined.) and moreover it requires
administrative commands.</p>
</div>
@@ -207,8 +229,10 @@
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_synchronizing_local_files_with_a_repository">Synchronizing Local
Files with a Repository</h3>
+</div>
+<div class="sect1">
+<h2 id="_synchronizing_local_files_with_a_repository">Synchronizing Local
Files with a Repository</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>When using a version control system, you work by synchronizing local files
with a repository, making changes to your local copy, then committing them to
the repository. The following list describes various ways you can synchronize a
project in NetBeans IDE, depending on your specific situation:</p>
</div>
@@ -225,14 +249,14 @@
</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_opening_a_subversion_project_in_the_ide">Opening a Subversion Project
in the IDE</h4>
+<div class="sect2">
+<h3 id="_opening_a_subversion_project_in_the_ide">Opening a Subversion Project
in the IDE</h3>
<div class="paragraph">
<p>If you already have a Subversion versioned project which you have been
working with outside of the IDE, you can open it in the IDE and versioning
features will automatically become available to you. The IDE scans your open
projects and if they contain <code>.svn</code> directories, file status and
context-sensitive support automatically becomes active for Subversion versioned
projects.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_checking_out_files_from_a_repository">Checking out Files from a
Repository</h4>
+<div class="sect2">
+<h3 id="_checking_out_files_from_a_repository">Checking out Files from a
Repository</h3>
<div class="paragraph">
<p>If you want to connect to a remote repository from the IDE, then check out
files and immediately begin working with them, do the following:</p>
</div>
@@ -339,14 +363,14 @@ If you are trying to implement certificated
authentication with <code>https</cod
<i class="fa icon-note" title="Note"></i>
</td>
<td class="content">
-*If the checked out sources contain NetBeans projects, a dialog appears
prompting you to open them in the IDE. If the sources do not contain a project,
the dialog appears prompting you to create a new project from the sources and
then open them in the IDE. If you create a new project for such sources, select
the appropriate project category (i.e. in the New Project wizard) and then use
the With Existing Sources option within that category.
+If the checked out sources contain NetBeans projects, a dialog appears
prompting you to open them in the IDE. If the sources do not contain a project,
the dialog appears prompting you to create a new project from the sources and
then open them in the IDE. If you create a new project for such sources, select
the appropriate project category (i.e. in the New Project wizard) and then use
the With Existing Sources option within that category.
</td>
</tr>
</table>
</div>
</div>
-<div class="sect3">
-<h4 id="_importing_files_into_a_repository">Importing Files into a
Repository</h4>
+<div class="sect2">
+<h3 id="_importing_files_into_a_repository">Importing Files into a
Repository</h3>
<div class="paragraph">
<p>Alternately, you can import a project you have been working on in the IDE
to a remote repository, then continue to work on it in the IDE after it has
become synchronized.</p>
</div>
@@ -392,8 +416,10 @@ If you are trying to implement certificated authentication
with <code>https</cod
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_editing_sources">Editing Sources</h3>
+</div>
+<div class="sect1">
+<h2 id="_editing_sources">Editing Sources</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Once you have a Subversion versioned project opened in the IDE, you can
begin making changes to sources. As with any project opened in NetBeans IDE,
you can open files in the Source Editor by double-clicking on their nodes, as
they appear in the IDE’s windows (for example, Projects (Ctrl-1 on
Windows/Cmd-1 on OS X), Files (Ctrl-2 on Windows/Cmd-2 on OS X), Favorites
(Ctrl-3 on Windows/Cmd-3 on OS X)).</p>
</div>
@@ -416,8 +442,8 @@ If you are trying to implement certificated authentication
with <code>https</cod
</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source
Editor</h4>
+<div class="sect2">
+<h3 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source
Editor</h3>
<div class="paragraph">
<p>When you open a versioned file in the IDE’s Source Editor, you can
view real-time changes occurring to your file as you modify it against your
previously checked-out base version from the repository. As you work, the IDE
uses color encoding in the Source Editor’s margins to convey the
following information:</p>
</div>
@@ -470,8 +496,8 @@ If you are trying to implement certificated authentication
with <code>https</cod
</tbody>
</table>
</div>
-<div class="sect3">
-<h4 id="_viewing_file_status_information">Viewing File Status Information</h4>
+<div class="sect2">
+<h3 id="_viewing_file_status_information">Viewing File Status Information</h3>
<div class="paragraph">
<p>When you are working in the Projects (Ctrl-1 on Windows/Cmd-1 on OS X),
Files (Ctrl-2 on Windows/Cmd-2 on OS X), Favorites (Ctrl-3 on Windows/Cmd-3 on
OS X), or Versioning windows, the IDE provides several visual features that aid
in viewing status information about your files. In the example below, notice
how the badge (e.g. image::images/blue-badge.png[]), color of the file name,
and adjacent status label, all coincide with each other to provide you with a
simple but effective way t [...]
</div>
@@ -496,8 +522,8 @@ If you are trying to implement certificated authentication
with <code>https</cod
</li>
</ul>
</div>
-<div class="sect4">
-<h5 id="_badges_and_color_coding">Badges and Color Coding</h5>
+<div class="sect3">
+<h4 id="_badges_and_color_coding">Badges and Color Coding</h4>
<div class="paragraph">
<p>Badges are applied to project, folder, and package nodes and inform you of
the status of files contained within that node:</p>
</div>
@@ -571,8 +597,8 @@ If you are trying to implement certificated authentication
with <code>https</cod
</tbody>
</table>
</div>
-<div class="sect4">
-<h5 id="_file_status_labels">File Status Labels</h5>
+<div class="sect3">
+<h4 id="_file_status_labels">File Status Labels</h4>
<div class="paragraph">
<p>File status labels provide a textual indication of the status of versioned
files in the IDE’s windows. By default, the IDE displays status (new,
modified, ignored, etc.) and folder information in gray text to the right of
files, as they are listed in windows. You can, however, modify this format to
suit your own needs. For example, if you want to add revision numbers to status
labels, do the following:</p>
</div>
@@ -612,8 +638,8 @@ If you are trying to implement certificated authentication
with <code>https</cod
<p>File status labels can be toggled on and off by choosing View > Show
Versioning Labels from the main menu.</p>
</div>
</div>
-<div class="sect4">
-<h5 id="_the_versioning_window">The Versioning Window</h5>
+<div class="sect3">
+<h4 id="_the_versioning_window">The Versioning Window</h4>
<div class="paragraph">
<p>The Subversion Versioning window provides you with a real-time list of all
of the changes made to files within a selected folder of your local working
copy. It opens by default in the bottom panel of the IDE, listing added,
deleted or modified files.</p>
</div>
@@ -751,8 +777,8 @@ Operations in the Projects window work only on the projects
themselves and are n
</table>
</div>
</div>
-<div class="sect3">
-<h4 id="_comparing_file_revisions">Comparing File Revisions</h4>
+<div class="sect2">
+<h3 id="_comparing_file_revisions">Comparing File Revisions</h3>
<div class="paragraph">
<p>Comparing file revisions is a common task when working with versioned
projects. The IDE enables you to compare revisions by using the Diff command,
which is available from the right-click menu of a selected item (Subversion
> Diff), as well as from the Versioning window. In the Versioning window,
you can perform diffs by either double-clicking a listed file, otherwise you
can click the Diff All icon (image::images/diff.png[]) located in the toolbar
at the top.</p>
</div>
@@ -790,8 +816,8 @@ Operations in the Projects window work only on the projects
themselves and are n
</li>
</ul>
</div>
-<div class="sect4">
-<h5 id="_make_changes_to_your_local_working_copy">Make Changes to your Local
Working Copy</h5>
+<div class="sect3">
+<h4 id="_make_changes_to_your_local_working_copy">Make Changes to your Local
Working Copy</h4>
<div class="paragraph">
<p>If you are performing a diff on your local working copy, the IDE enables
you to make changes directly from within the Diff Viewer. To do so, you can
either place your cursor within the right pane of the Diff Viewer and modify
your file accordingly, otherwise make use of the inline icons that display
adjacent to each highlighted change:</p>
</div>
@@ -818,8 +844,8 @@ Operations in the Projects window work only on the projects
themselves and are n
</tbody>
</table>
</div>
-<div class="sect4">
-<h5 id="_navigate_among_differences_between_compared_files">Navigate among
Differences between Compared Files</h5>
+<div class="sect3">
+<h4 id="_navigate_among_differences_between_compared_files">Navigate among
Differences between Compared Files</h4>
<div class="paragraph">
<p>If your diff contains multiple differences, you can navigate among them by
using the arrow icons displayed in the toolbar. The arrow icons enable you to
view differences as they appear from top to bottom:</p>
</div>
@@ -842,8 +868,8 @@ Operations in the Projects window work only on the projects
themselves and are n
</tbody>
</table>
</div>
-<div class="sect4">
-<h5 id="_change_viewing_criteria">Change Viewing Criteria</h5>
+<div class="sect3">
+<h4 id="_change_viewing_criteria">Change Viewing Criteria</h4>
<div class="paragraph">
<p>You can choose whether to view files containing changes from the local
working copy, the repository, as well as both simultaneously:</p>
</div>
@@ -883,8 +909,8 @@ The color scheme described in the <a href="#badges">Badges
and Color Coding</a>
</div>
</div>
</div>
-<div class="sect3">
-<h4 id="_merging_file_revisions">Merging File Revisions</h4>
+<div class="sect2">
+<h3 id="_merging_file_revisions">Merging File Revisions</h3>
<div class="paragraph">
<p>NetBeans IDE enables you to merge changes between repository revisions and
your local working copy. You can specify a range of revisions to merge. You can
even merge a range of revisions from two separate repository folders.</p>
</div>
@@ -928,8 +954,10 @@ The color scheme described in the <a href="#badges">Badges
and Color Coding</a>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_committing_sources_to_a_repository">Committing Sources to a
Repository</h3>
+</div>
+<div class="sect1">
+<h2 id="_committing_sources_to_a_repository">Committing Sources to a
Repository</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>After making changes to sources, you commit them to the repository. It is
generally a good idea to update any copies you have against the repository
prior to performing a commit in order to ensure that conflicts do not arise.
Conflicts can occur however, and should be thought of as a natural event when
numerous developers are working on a project simultaneously. The IDE provides
flexible support that enables you to perform all of these functions. It also
provides a Conflict Resolver w [...]
</div>
@@ -946,8 +974,8 @@ The color scheme described in the <a href="#badges">Badges
and Color Coding</a>
</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_updating_local_copies">Updating Local Copies</h4>
+<div class="sect2">
+<h3 id="_updating_local_copies">Updating Local Copies</h3>
<div class="paragraph">
<p>You can perform updates by choosing Subversion > Update from the
right-click menu of any versioned item in the Projects, Files, or Favorites
windows. When working directly from the Versioning window, you need only
right-click a listed file and choose Update.</p>
</div>
@@ -955,8 +983,8 @@ The color scheme described in the <a href="#badges">Badges
and Color Coding</a>
<p>To perform an update on all source files, you can click the Update All icon
(image::images/update.png[]), which displays in the toolbars located at the top
of both the <a href="#versioning">Versioning Window</a>, as well as the <a
href="#comparing">Diff Viewer</a>. Any changes that may have occurred in the
repository are displayed in the Versioning Output window.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_resolving_conflicts">Resolving Conflicts</h4>
+<div class="sect2">
+<h3 id="_resolving_conflicts">Resolving Conflicts</h3>
<div class="paragraph">
<p>When you perform an update or a commit, the IDE’s Subversion support
compares your files with repository sources to make sure that other changes
have not already occurred in the same locations. When your previous checkout
(or update) no longer matches the repository <em>HEAD</em> (i.e. most current
revision), <em>and</em> the changes that you applied to your local working copy
coincide with areas in the HEAD that have also changed, your update or commit
results in a <em>conflict [...]
</div>
@@ -987,8 +1015,8 @@ The color scheme described in the <a href="#badges">Badges
and Color Coding</a>
<p>You resolve a conflict by accepting one of the two revisions displayed in
the top pane. Click the Accept button of the revision you want to accept. The
IDE merges the accepted revision with the source file, and you can immediately
see the results of the merge in the bottom pane of the Merge Conflicts
Resolver. Once all conflicts are resolved, click OK to exit the Merge Conflicts
Resolver and save the modified file. The conflict badge is removed and you can
now commit the modified file [...]
</div>
</div>
-<div class="sect3">
-<h4 id="_performing_the_commit">Performing the Commit</h4>
+<div class="sect2">
+<h3 id="_performing_the_commit">Performing the Commit</h3>
<div class="paragraph">
<p>After editing source files, performing an update and resolving any
conflicts, you commit files from your local working copy to the repository. The
IDE enables you to call the commit command in the following ways:</p>
</div>
@@ -1054,14 +1082,15 @@ The color scheme described in the <a
href="#badges">Badges and Color Coding</a>
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_summary">Summary</h3>
+</div>
+<div class="sect1">
+<h2 id="_summary">Summary</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>This concludes the guided tour of Subversion for NetBeans IDE 6.x and
higher. This document demonstrated how to perform basic versioning tasks in the
IDE by guiding you through the standard workflow when using the IDE’s
Subversion support. It has shown how to set up a versioned project and perform
basic tasks on versioned files while introducing you to some of the new
Subversion features included in the IDE.</p>
</div>
<div class="paragraph">
-<p><top,top>></p>
-</div>
+<p><a href="#top">top</a></p>
</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
