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 15fcdb5 Automated site publishing by Jenkins build 391
15fcdb5 is described below
commit 15fcdb5ab8a11d03f1ab8dafca1642c9566ee65e
Author: jenkins <bui...@apache.org>
AuthorDate: Sat Jan 19 11:42:55 2019 +0000
Automated site publishing by Jenkins build 391
---
content/kb/docs/ide/mercurial.html | 243 +++++++++----------------------------
1 file changed, 57 insertions(+), 186 deletions(-)
diff --git a/content/kb/docs/ide/mercurial.html
b/content/kb/docs/ide/mercurial.html
index 84bf76f..6126aa2 100644
--- a/content/kb/docs/ide/mercurial.html
+++ b/content/kb/docs/ide/mercurial.html
@@ -80,38 +80,20 @@
<div class='grid-container main-content tutorial'>
<div id="toc" class="toc">
<div id="toctitle"></div>
+<ul class="sectlevel1">
+<li><a href="#_using_mercurial_support_in_netbeans_ide">Using Mercurial
Support in NetBeans IDE</a>
<ul class="sectlevel2">
-<li><a href="#_contents">Contents</a></li>
-<li><a href="#_requirements">Requirements</a></li>
<li><a href="#_setting_up_mercurial">Setting up Mercurial</a></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_mercurial_project_in_the_ide">Opening a Mercurial
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="#_performing_the_commit">Performing the Commit</a></li>
-<li><a href="#_updating_issues">Updating Issues</a></li>
-<li><a href="#_pushing_local_changes_to_the_shared_repository">Pushing Local
Changes to the Shared Repository</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>
</ul>
</li>
-<li><a href="#_summary">Summary</a></li>
-<li><a href="#_see_also">See Also</a></li>
</ul>
</div>
-<div id="preamble">
+<div class="sect1">
+<h2 id="_using_mercurial_support_in_netbeans_ide">Using Mercurial Support in
NetBeans IDE</h2>
<div class="sectionbody">
<div class="paragraph">
<p>NetBeans IDE provides support for the Mercurial version control client
versions 1.0.x and higher. The IDE’s Mercurial support allows you to
perform versioning tasks directly from your project within the IDE. This
document demonstrates how to perform basic versioning tasks in the IDE by
guiding you through the standard workflow when using versioning software.</p>
@@ -122,97 +104,8 @@
<div class="paragraph">
<p>The IDE’s Mercurial support is similar to the IDE’s Subversion
support. The main difference is that Mercurial is a distributed revision
control system. Users typically begin by <em>cloning</em> an external
repository to work with. This clone is a complete copy of the repository
including the revision history. You can clone the local copy as often as needed
and when ready, push locally made changes back to the original repository if
you have permissions, or <em>export</em> [...]
</div>
-</div>
-</div>
<div class="sect2">
-<h3 id="_contents">Contents</h3>
-<div class="imageblock">
-<div class="content">
-<img src="images/netbeans-stamp.png" alt="netbeans stamp">
-</div>
-<div class="title">Figure 1. Content on this page applies to the NetBeans IDE
8.0</div>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#settingUp">Setting up Mercurial</a></p>
-</li>
-<li>
-<p><a href="#synchronizing">Synchronizing Local Files with a Repository</a></p>
-</li>
-<li>
-<p><a href="#editing">Editing Sources</a></p>
-</li>
-<li>
-<p><a href="#viewingChanges">Viewing Changes in the Source Editor</a></p>
-</li>
-<li>
-<p><a href="#viewingFileStatus">Viewing File Status Information</a></p>
-</li>
-<li>
-<p><a href="#comparing">Comparing File Revisions</a></p>
-</li>
-<li>
-<p><a href="#committing">Committing Sources to a Repository</a></p>
-</li>
-<li>
-<p><a href="#updating">Updating Local Copies</a></p>
-</li>
-<li>
-<p><a href="#committing">Performing the Commit</a></p>
-</li>
-<li>
-<p><a href="#issues">Updating Issues</a></p>
-</li>
-<li>
-<p><a href="#pushing">Pushing Local Changes to the Shared Repository</a></p>
-</li>
-<li>
-<p><a href="#summary">Summary</a></p>
-</li>
-<li>
-<p><a href="#seeAlso">See Also</a></p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_requirements">Requirements</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p><strong>To complete this tutorial, you need the following software and
resources.</strong></p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Software or Resource</th>
-<th class="tableblock halign-left valign-top">Version Required</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a
href="https://netbeans.org/downloads/index.html";>NetBeans IDE</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Version
8.0</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>Java
Development Kit</a> (JDK)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Version 7
or 8</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a
href="http://www.selenic.com/mercurial/";>Mercurial client software</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1.04 or
more recent</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_setting_up_mercurial">Setting up Mercurial</h2>
-<div class="sectionbody">
+<h3 id="_setting_up_mercurial">Setting up Mercurial</h3>
<div class="paragraph">
<p>Before you can take advantage of the IDE’s Mercurial support, you
need to have Mercurial client software installed on your system. The IDE
supports Mercurial client versions 1.04 and higher. The IDE’s Mercurial
support works by using the same commands as the Mercurial command line
interface.</p>
</div>
@@ -278,10 +171,8 @@ The NetBeans Mercurial repositories (<a
href="http://hg.netbeans.org/";>http://hg
</table>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_synchronizing_local_files_with_a_repository">Synchronizing Local
Files with a Repository</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_synchronizing_local_files_with_a_repository">Synchronizing Local
Files with a Repository</h3>
<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 the NetBeans IDE, depending on your specific situation:</p>
</div>
@@ -298,14 +189,14 @@ The NetBeans Mercurial repositories (<a
href="http://hg.netbeans.org/";>http://hg
</li>
</ul>
</div>
-<div class="sect2">
-<h3 id="_opening_a_mercurial_project_in_the_ide">Opening a Mercurial Project
in the IDE</h3>
+<div class="sect3">
+<h4 id="_opening_a_mercurial_project_in_the_ide">Opening a Mercurial Project
in the IDE</h4>
<div class="paragraph">
<p>If you already have a Mercurial 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 the open
projects, file status and context-sensitive support automatically becomes
active for Mercurial versioned projects.</p>
</div>
</div>
-<div class="sect2">
-<h3 id="_checking_out_files_from_a_repository">Checking out Files from a
Repository</h3>
+<div class="sect3">
+<h4 id="_checking_out_files_from_a_repository">Checking out Files from a
Repository</h4>
<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>
@@ -420,12 +311,21 @@ The IDE checks out the specified sources and the
IDE’s status bar indicate
</li>
</ol>
</div>
-<div class="paragraph">
-<p>*Note: *If the checked out sources contain NetBeans projects, a dialog box
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 (in the New Project wizard)
and then use the With Existing Sources option within that category.</p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+If the checked out sources contain NetBeans projects, a dialog box 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 (in the New Project wizard) and then use the
With Existing Sources option within that category.
+</td>
+</tr>
+</table>
</div>
</div>
-<div class="sect2">
-<h3 id="_importing_files_into_a_repository">Importing Files into a
Repository</h3>
+<div class="sect3">
+<h4 id="_importing_files_into_a_repository">Importing Files into a
Repository</h4>
<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>
@@ -530,10 +430,8 @@ The committed files are placed together with the
<code>.hg</code> directory in
</div>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_editing_sources">Editing Sources</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_editing_sources">Editing Sources</h3>
<div class="paragraph">
<p>Once you have a Mercurial 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 (e.g. Projects (Ctrl-1 on
Windows/Command-1 on OS X), Files (Ctrl-2 on Windows/Command-2 on OS X),
Favorites (Ctrl-3 on Windows/Command-3 on OS X) windows).</p>
</div>
@@ -556,8 +454,8 @@ The committed files are placed together with the
<code>.hg</code> directory in
</li>
</ul>
</div>
-<div class="sect2">
-<h3 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source
Editor</h3>
+<div class="sect3">
+<h4 id="_viewing_changes_in_the_source_editor">Viewing Changes in the Source
Editor</h4>
<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>
@@ -610,8 +508,8 @@ The committed files are placed together with the
<code>.hg</code> directory in
</tbody>
</table>
</div>
-<div class="sect2">
-<h3 id="_viewing_file_status_information">Viewing File Status Information</h3>
+<div class="sect3">
+<h4 id="_viewing_file_status_information">Viewing File Status Information</h4>
<div class="paragraph">
<p>When you are working in the Projects (Ctrl-1 on Windows/Command-1 on OS X),
Files (Ctrl-2 on Windows/Command-2 on OS X), Favorites (Ctrl-3 on
Windows/Command-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 eff [...]
</div>
@@ -648,8 +546,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_badges_and_color_coding">Badges and Color Coding</h4>
+<div class="sect4">
+<h5 id="_badges_and_color_coding">Badges and Color Coding</h5>
<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>
@@ -723,8 +621,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</tbody>
</table>
</div>
-<div class="sect3">
-<h4 id="_file_status_labels">File Status Labels</h4>
+<div class="sect4">
+<h5 id="_file_status_labels">File Status Labels</h5>
<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>
@@ -758,8 +656,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
<p>File status labels can be toggled on and off by choosing <code>View</code>
> <code>Show Versioning Labels</code> from the main menu.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_the_versioning_window">The Versioning Window</h4>
+<div class="sect4">
+<h5 id="_the_versioning_window">The Versioning Window</h5>
<div class="paragraph">
<p>The Mercurial 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>
@@ -840,8 +738,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</table>
</div>
</div>
-<div class="sect2">
-<h3 id="_comparing_file_revisions">Comparing File Revisions</h3>
+<div class="sect3">
+<h4 id="_comparing_file_revisions">Comparing File Revisions</h4>
<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 (
<code>Mercurial</code> > <code>Diff</code> > <code>Diff To
Base</code> or <code>Mercurial</code> > <code>Diff</code> >
<code>Diff To Revision</code> ), as well as from the Versioning window. In the
Versioning window, you can perform diffs by either doub [...]
</div>
@@ -876,6 +774,7 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</li>
</ul>
</div>
+</div>
<div class="sect3">
<h4 id="_make_changes_to_your_local_working_copy">Make Changes to your Local
Working Copy</h4>
<div class="paragraph">
@@ -928,9 +827,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</tbody>
</table>
</div>
-</div>
-<div class="sect2">
-<h3 id="_merging_file_revisions">Merging File Revisions</h3>
+<div class="sect3">
+<h4 id="_merging_file_revisions">Merging File Revisions</h4>
<div class="paragraph">
<p>NetBeans IDE enables you to merge changes between repository revisions and
your local working copy. Specifically, this combines two separate changesets in
a repository into a new changeset that describes how they combine.</p>
</div>
@@ -968,10 +866,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</div>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_committing_sources_to_a_repository">Committing Sources to a
Repository</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_committing_sources_to_a_repository">Committing Sources to a
Repository</h3>
<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>
@@ -991,8 +887,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</li>
</ul>
</div>
-<div class="sect2">
-<h3 id="_updating_local_copies">Updating Local Copies</h3>
+<div class="sect3">
+<h4 id="_updating_local_copies">Updating Local Copies</h4>
<div class="paragraph">
<p>You can perform updates by choosing <code>Team</code> >
<code>Update</code> from the main menu.</p>
</div>
@@ -1000,8 +896,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
<p>To perform an update on sources that you have modified, 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="sect2">
-<h3 id="_performing_the_commit">Performing the Commit</h3>
+<div class="sect3">
+<h4 id="_performing_the_commit">Performing the Commit</h4>
<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>
@@ -1063,8 +959,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</ol>
</div>
</div>
-<div class="sect2">
-<h3 id="_updating_issues">Updating Issues</h3>
+<div class="sect3">
+<h4 id="_updating_issues">Updating Issues</h4>
<div class="paragraph">
<p>You can update an issue by associating your commit action with an existing
issue in your repository’s issue tracker. To do so, click on the Update
Issue heading in the Commit dialog box to expand it, then specify the
following:</p>
</div>
@@ -1104,8 +1000,8 @@ Status labels are textual indication of file status in
the Versioning, Projects,
</ul>
</div>
</div>
-<div class="sect2">
-<h3 id="_pushing_local_changes_to_the_shared_repository">Pushing Local Changes
to the Shared Repository</h3>
+<div class="sect3">
+<h4 id="_pushing_local_changes_to_the_shared_repository">Pushing Local Changes
to the Shared Repository</h4>
<div class="paragraph">
<p>Before pushing changes that you have committed locally to the shared
repository, you need to synchronize your local repository with the shared
repository. To do this with the Fetch command, choose <code>Team</code> >
( <code>Mercurial</code> >) <code>Remote</code> > <code>Fetch</code>
from the main menu. After you perform a successful Fetch, your local repository
becomes synchronized with the shared repository.</p>
</div>
@@ -1126,36 +1022,11 @@ Since you maintain a copy of the entire repository on
your system, the general p
</div>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_summary">Summary</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_summary">Summary</h3>
<div class="paragraph">
<p>This tutorial showed how to perform basic versioning tasks in the IDE by
guiding you through the standard workflow when using the IDE’s Mercurial
support. It demonstrated how to set up a versioned project and perform basic
tasks on versioned files while introducing you to some of the Mercurial
specific features included in the IDE.</p>
</div>
-<div class="paragraph">
-<p><a
href="/about/contact_form.html?to=3&subject=Feedback:%20Using%20Mercurial%20Support%20in%20NetBeans%20IDE">Send
Feedback on This Tutorial</a></p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_see_also">See Also</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>For related material see the following documents:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://wiki.netbeans.org/HgNetBeansSources";>Using Mercurial to
work with NetBeans Sources in the IDE</a></p>
-</li>
-<li>
-<p><a href="mercurial-queues.html">Using Mercurial Queues Support in NetBeans
IDE</a></p>
-</li>
-<li>
-<p><a
href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG234";>Versioning
Applications with Version Control</a> in <em>Developing Applications with
NetBeans IDE</em></p>
-</li>
-</ul>
</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
