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 cc621b6 Automated site publishing by Jenkins build 495
cc621b6 is described below
commit cc621b6c6d38d3b61a70bcae8a785f52debe7eeb
Author: jenkins <[email protected]>
AuthorDate: Thu Jan 24 21:48:59 2019 +0000
Automated site publishing by Jenkins build 495
---
content/kb/docs/ide/mercurial.html | 133 ++++++++++++++++++++++---------------
1 file changed, 80 insertions(+), 53 deletions(-)
diff --git a/content/kb/docs/ide/mercurial.html
b/content/kb/docs/ide/mercurial.html
index a0eab9e..f6e5538 100644
--- a/content/kb/docs/ide/mercurial.html
+++ b/content/kb/docs/ide/mercurial.html
@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
- <title>Using Mercurial Support in NetBeans IDE</title>
+ <title>Using Mercurial in Apache NetBeans</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Using Mercurial Support in NetBeans IDE
- Apache NetBeans">
<meta name="author" content="Apache NetBeans">
@@ -78,23 +78,40 @@
</section>
<div class='grid-container main-content tutorial'>
- <h1 class="sect0">Using Mercurial Support in NetBeans IDE</h1>
+ <h1 class="sect0">Using Mercurial in Apache NetBeans</h1>
<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="#_setting_up_mercurial">Setting up Mercurial</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="#_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="#_make_changes_to_your_local_working_copy">Make Changes to your
Local Working Copy</a></li>
+<li><a href="#_navigate_among_differences_between_compared_files">Navigate
among Differences between Compared Files</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>
</ul>
</li>
+<li><a href="#_summary">Summary</a></li>
</ul>
</div>
-<div class="sect1">
-<h2 id="_using_mercurial_support_in_netbeans_ide">Using Mercurial Support in
NetBeans IDE</h2>
+<div id="preamble">
<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>
@@ -105,8 +122,11 @@
<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 class="sect2">
-<h3 id="_setting_up_mercurial">Setting up Mercurial</h3>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_setting_up_mercurial">Setting up Mercurial</h2>
+<div class="sectionbody">
<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>
@@ -172,8 +192,10 @@ The NetBeans Mercurial repositories (<a
href="http://hg.netbeans.org/";>http://hg
</table>
</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 the NetBeans IDE, depending on your specific situation:</p>
</div>
@@ -190,14 +212,14 @@ The NetBeans Mercurial repositories (<a
href="http://hg.netbeans.org/";>http://hg
</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_opening_a_mercurial_project_in_the_ide">Opening a Mercurial Project
in the IDE</h4>
+<div class="sect2">
+<h3 id="_opening_a_mercurial_project_in_the_ide">Opening a Mercurial Project
in the IDE</h3>
<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="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>
@@ -325,8 +347,8 @@ If the checked out sources contain NetBeans projects, a
dialog box appears promp
</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>
@@ -431,8 +453,10 @@ The committed files are placed together with the
<code>.hg</code> directory in
</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 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>
@@ -455,8 +479,8 @@ The committed files are placed together with the
<code>.hg</code> directory in
</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>
@@ -509,8 +533,8 @@ The committed files are placed together with the
<code>.hg</code> directory in
</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/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>
@@ -547,8 +571,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</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>
@@ -622,8 +646,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</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>
@@ -657,8 +681,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="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 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>
@@ -739,8 +763,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</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 (
<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>
@@ -776,8 +800,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</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="sect2">
+<h3 id="_make_changes_to_your_local_working_copy">Make Changes to your Local
Working Copy</h3>
<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>
@@ -804,8 +828,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</tbody>
</table>
</div>
-<div class="sect3">
-<h4 id="_navigate_among_differences_between_compared_files">Navigate among
Differences between Compared Files</h4>
+<div class="sect2">
+<h3 id="_navigate_among_differences_between_compared_files">Navigate among
Differences between Compared Files</h3>
<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>
@@ -828,8 +852,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</tbody>
</table>
</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. Specifically, this combines two separate changesets in
a repository into a new changeset that describes how they combine.</p>
</div>
@@ -867,8 +891,10 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</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>
@@ -888,8 +914,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</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 <code>Team</code> >
<code>Update</code> from the main menu.</p>
</div>
@@ -897,8 +923,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="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>
@@ -960,8 +986,8 @@ Status labels are textual indication of file status in the
Versioning, Projects,
</ol>
</div>
</div>
-<div class="sect3">
-<h4 id="_updating_issues">Updating Issues</h4>
+<div class="sect2">
+<h3 id="_updating_issues">Updating Issues</h3>
<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>
@@ -1001,8 +1027,8 @@ Status labels are textual indication of file status in
the Versioning, Projects,
</ul>
</div>
</div>
-<div class="sect3">
-<h4 id="_pushing_local_changes_to_the_shared_repository">Pushing Local Changes
to the Shared Repository</h4>
+<div class="sect2">
+<h3 id="_pushing_local_changes_to_the_shared_repository">Pushing Local Changes
to the Shared Repository</h3>
<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>
@@ -1023,14 +1049,15 @@ Since you maintain a copy of the entire repository on
your system, the general p
</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 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>
</div>
-</div>
<section class='tools'>
<ul class="menu align-center">
---------------------------------------------------------------------
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
