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 a21c8ba Automated site publishing by Jenkins build 389
a21c8ba is described below
commit a21c8ba2bf4f22f6eb3383eeb0b8c0cb6041a828
Author: jenkins <bui...@apache.org>
AuthorDate: Sat Jan 19 11:38:49 2019 +0000
Automated site publishing by Jenkins build 389
---
content/kb/docs/ide/mercurial-queues.html | 184 +++++-------------------------
1 file changed, 29 insertions(+), 155 deletions(-)
diff --git a/content/kb/docs/ide/mercurial-queues.html
b/content/kb/docs/ide/mercurial-queues.html
index 97fed84..0df7e84 100644
--- a/content/kb/docs/ide/mercurial-queues.html
+++ b/content/kb/docs/ide/mercurial-queues.html
@@ -80,9 +80,9 @@
<div class='grid-container main-content tutorial'>
<div id="toc" class="toc">
<div id="toctitle"></div>
+<ul class="sectlevel1">
+<li><a href="#_using_support_for_mercurial_queues_in_netbeans_ide">Using
Support for Mercurial Queues in NetBeans IDE</a>
<ul class="sectlevel2">
-<li><a href="#_contents">Contents</a></li>
-<li><a href="#_requirements">Requirements</a></li>
<li><a href="#_enabling_the_mercurial_queues_support">Enabling the Mercurial
Queues Support</a></li>
<li><a href="#_creating_a_patch">Creating a Patch</a></li>
<li><a href="#_refreshing_a_patch_with_local_modifications">Refreshing a Patch
With Local Modifications</a></li>
@@ -90,105 +90,18 @@
<li><a href="#_switching_between_patches">Switching Between Patches</a></li>
<li><a href="#_finishing_applied_patches">Finishing Applied Patches</a></li>
<li><a href="#_summary">Summary</a></li>
-<li><a href="#_see_also">See Also</a></li>
</ul>
-</div>
-<div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p>The NetBeans IDE provides support for the Mercurial Queues extension. The
IDE’s Mercurial Queues support allows you to create, review or switch
between patches within the IDE, as well as refresh patches with local
modifications as you fix bugs or update to a new base revision. This document
demonstrates how to perform basic patch-specific tasks in the IDE by guiding
you through the standard workflow when using Mercurial versioning software for
managing patches.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_contents">Contents</h3>
-<div class="imageblock">
-<div class="content">
-<img src="images/netbeans-stamp-80-74.png" alt="netbeans stamp 80 74">
-</div>
-<div class="title">Figure 1. Content on this page applies to the NetBeans IDE
7.4 and 8.0</div>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#reqs">Requirements</a></p>
-</li>
-<li>
-<p><a href="#enable">Enabling the Mercurial Queues Support</a></p>
-</li>
-<li>
-<p><a href="#create">Creating a Patch</a></p>
-</li>
-<li>
-<p><a href="#refresh">Refreshing a Patch With Local Modifications </a></p>
-</li>
-<li>
-<p><a href="#diff">Comparing Patch Revisions</a></p>
-</li>
-<li>
-<p><a href="#switch">Switching Between Patches </a></p>
-</li>
-<li>
-<p><a href="#finish">Finishing Applied Patches</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>
+<h2 id="_using_support_for_mercurial_queues_in_netbeans_ide">Using Support for
Mercurial Queues in NetBeans IDE</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
7.4 or 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://mercurial.selenic.com/downloads/";>Mercurial client
software</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1.04 or
higher</p></td>
-</tr>
-</tbody>
-</table>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-Refer to the <a href="mercurial.html#settingUp">Using Mercurial Support in
NetBeans IDE</a> for information on how to install Mercurial client software on
your system.
-</td>
-</tr>
-</table>
-</div>
-</div>
+<p>The NetBeans IDE provides support for the Mercurial Queues extension. The
IDE’s Mercurial Queues support allows you to create, review or switch
between patches within the IDE, as well as refresh patches with local
modifications as you fix bugs or update to a new base revision. This document
demonstrates how to perform basic patch-specific tasks in the IDE by guiding
you through the standard workflow when using Mercurial versioning software for
managing patches.</p>
</div>
-<div class="sect1">
-<h2 id="_enabling_the_mercurial_queues_support">Enabling the Mercurial Queues
Support</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_enabling_the_mercurial_queues_support">Enabling the Mercurial Queues
Support</h3>
<div class="paragraph">
<p>Since Mercurial Queues is an extension, you must explicitly enable it
before you can use it.
To start running Mercurial Queues on your Mercurial repository, you need to
complete the following steps:</p>
@@ -220,10 +133,8 @@ To start running Mercurial Queues on your Mercurial
repository, you need to comp
<p><a href="#top">top</a></p>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_creating_a_patch">Creating a Patch</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_creating_a_patch">Creating a Patch</h3>
<div class="paragraph">
<p>To create a patch, you need to complete the following steps:</p>
</div>
@@ -295,10 +206,8 @@ A new patch is created and added to the
<code>.hg/patches</code> directory.</p
<p><a href="#top">top</a></p>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_refreshing_a_patch_with_local_modifications">Refreshing a Patch With
Local Modifications</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_refreshing_a_patch_with_local_modifications">Refreshing a Patch With
Local Modifications</h3>
<div class="paragraph">
<p>To save your progress into the patch you are creating , you need to
complete the following steps:</p>
</div>
@@ -367,10 +276,8 @@ The patch you are working on is updated.</p>
<p><a href="#top">top</a></p>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_comparing_patch_revisions">Comparing Patch Revisions</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_comparing_patch_revisions">Comparing Patch Revisions</h3>
<div class="paragraph">
<p>To generate a patch for review and compare revisions of a patch side by
side, you need to complete the following steps:</p>
</div>
@@ -470,10 +377,8 @@ The Graphical Diff Viewer highlights changes in the files
using the following co
<p><a href="#top">top</a></p>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_switching_between_patches">Switching Between Patches</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_switching_between_patches">Switching Between Patches</h3>
<div class="paragraph">
<p>To switch to a particular patch in a patch queue series, you need to
complete the following steps:</p>
</div>
@@ -502,16 +407,18 @@ The Go To Patch dialog box displays a list of all patches
available in a stack.<
<img src="images/go-patch.png" alt="go patch">
</div>
</div>
-<div class="paragraph">
-<p><strong>Notes:</strong></p>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+Names of applied patches display in bold. Choose <code>Team</code> >
<code>Queues</code> > <code>Pop All Patches</code> to remove the applied
patches from the top of the stack and update the working directory to undo the
effects of the applied patches.
+</td>
+</tr>
+</table>
</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Names of applied patches display in bold.</p>
-</li>
-<li>
-<p>Choose <code>Team</code> > <code>Queues</code> > <code>Pop All
Patches</code> to remove the applied patches from the top of the stack and
update the working directory to undo the effects of the applied patches.</p>
<div class="olist arabic">
<ol class="arabic">
<li>
@@ -520,17 +427,12 @@ The IDE applies the changes contained in the selected
patch to the chosen projec
</li>
</ol>
</div>
-</li>
-</ul>
-</div>
<div class="paragraph">
<p><a href="#top">top</a></p>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="_finishing_applied_patches">Finishing Applied Patches</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_finishing_applied_patches">Finishing Applied Patches</h3>
<div class="paragraph">
<p>Once your work on a patch is done, it can be turned into a permanent
changeset.
To turn all applied patches in a patch queue series into regular changesets,
complete the following steps:</p>
@@ -591,42 +493,14 @@ The IDE turns all applied patches up to the selected
patch into regular changese
<p><a href="#top">top</a></p>
</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 patch-specific tasks in the IDE
by guiding you through the standard workflow when using Mercurial versioning
software for managing patches. It demonstrated how to enable the Mercurial
Queues support in the NetBeans IDE and perform basic tasks on patches while
introducing you to some of the Mercurial specific features included in the
IDE.</p>
</div>
<div class="paragraph">
<p><a href="#top">top</a></p>
</div>
-<div class="paragraph">
-<p><a
href="/about/contact_form.html?to=3&subject=Feedback:%20Using%20Suport%20For%20Mercurial%20Queues%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="mercurial.html">Using Mercurial Support in NetBeans IDE</a></p>
-</li>
-<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="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 class="paragraph">
-<p><a href="#top">top</a></p>
</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
